[BUG] when doing a bzr pull with conflicts

[Robert Collins]

On Wed, 2005-09-14 at 10:53 +0200, Stefan (metze) Metzmacher wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Hi *,
> 
> I created a test tree, foo.dev
> with one file (file1.txt) and I have done 2 commits,
> then I have created branch of it foo.metze,
> 
> then I done conflicting commits in both branches,
> 
> then I tried this:
> 
> metze at routox:~/devel/SCM/test-bzr/foo.dev> bzr check
> bzr: checked 8 revisions, 8 file texts
> metze at routox:~/devel/SCM/test-bzr/foo.dev> cd ..
> metze at routox:~/devel/SCM/test-bzr> cd foo.metze/
> metze at routox:~/devel/SCM/test-bzr/foo.metze> bzr pull ../foo.dev/
> comparing histories                                                            bzr: ERROR: Branch
> Branch(u'/home/Projects/SCM/test-bzr/foo.dev') has no revision
> metze at samba.org-20050914084421-74dfaea0667d827d
>   at /home/Projects/SCM/bzr/bzr.dev/bzrlib/branch.py line 588, in get_revision_xml_file()
>   see ~/.bzr.log for debug information

We need to look at why you get that traceback .. you shouldn't :).

That said, when you have divergent branches, you probably want to be
doing a 'merge' rather than a 'pull'. Pull is equivalent to CVS update
or SVN update, which only makes sense when you are still on the same
branch - i.e. you have not committed, which creates a unique branch.

I hope that helps,

Cheers
Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050915/6916070f/attachment.pgp