From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: Test failures in contrib/remote-helpers
Date: Tue, 13 Nov 2012 10:59:32 +0530 [thread overview]
Message-ID: <CALkWK0=+HGzLpFNPn_mo2_zt+pqYs230ZK4x3SweiFcXCD5zHQ@mail.gmail.com> (raw)
In-Reply-To: <CAMP44s1E7qKCPTH1MMuOwJkW8opmD+Q6bzD6j1-KM039g-Uq2g@mail.gmail.com>
Felipe Contreras wrote:
> And here's the one for bzr:
>
> --- a/contrib/remote-helpers/git-remote-bzr
> +++ b/contrib/remote-helpers/git-remote-bzr
> @@ -646,12 +646,12 @@ def get_repo(url, alias):
> global dirname, peer
>
> clone_path = os.path.join(dirname, 'clone')
> - origin = bzrlib.controldir.ControlDir.open(url)
> + origin = bzrlib.bzrdir.BzrDir.open(url)
> remote_branch = origin.open_branch()
>
> if os.path.exists(clone_path):
> # pull
> - d = bzrlib.controldir.ControlDir.open(clone_path)
> + d = bzrlib.bzrdir.BzrDir.open(clone_path)
> branch = d.open_branch()
> result = branch.pull(remote_branch, [], None, False)
> else:
>
> I have other fixes to run up to 2.0.
Works for me. All four tests pass now.
Reported-by: Ramkumar Ramachandra <artagnon@gmail.com>
Tested-by: Ramkumar Ramachandra <artagnon@gmail.com>
Ram
prev parent reply other threads:[~2012-11-13 5:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-11 10:32 Test failures in contrib/remote-helpers Ramkumar Ramachandra
2012-11-11 12:00 ` Felipe Contreras
2012-11-11 12:48 ` Ramkumar Ramachandra
2012-11-11 19:50 ` Felipe Contreras
2012-11-13 0:35 ` Felipe Contreras
2012-11-13 5:29 ` Ramkumar Ramachandra [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CALkWK0=+HGzLpFNPn_mo2_zt+pqYs230ZK4x3SweiFcXCD5zHQ@mail.gmail.com' \
--to=artagnon@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).