[BUG] when doing a bzr pull with conflicts

[Stefan (metze) Metzmacher]

-----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

(note ~/devel is a symlink to /home/Projects but that doesn't matter)

here's the ~/.bzr.log:
[12085] Wed 10:45:40.429 INFO: checked 8 revisions, 8 file texts
[12086] Wed 10:45:51.846 ERROR: Branch Branch(u'/home/Projects/SCM/test-bzr/foo.
dev') has no revision metze at samba.org-20050914084421-74dfaea0667d827d
Traceback (most recent call last):
  File "/home/Projects/SCM/bzr/bzr.dev/bzrlib/commands.py", line 640, in main
    return run_bzr(argv[1:])
  File "/home/Projects/SCM/bzr/bzr.dev/bzrlib/commands.py", line 629, in run_bzr
    ret = cmd_obj.run_argv(argv)
  File "/home/Projects/SCM/bzr/bzr.dev/bzrlib/commands.py", line 287, in run_arg
v
    return self.run(**all_cmd_args)
  File "/home/Projects/SCM/bzr/bzr.dev/bzrlib/builtins.py", line 331, in run
    br_to.update_revisions(br_from)
  File "/home/Projects/SCM/bzr/bzr.dev/bzrlib/branch.py", line 820, in update_re
visions
    end_revision, other)
  File "/home/Projects/SCM/bzr/bzr.dev/bzrlib/revision.py", line 288, in get_int
ervening_revisions
    rev_source.get_revision(ancestor_id)
  File "/home/Projects/SCM/bzr/bzr.dev/bzrlib/branch.py", line 599, in get_revis
ion
    xml_file = self.get_revision_xml_file(revision_id)
  File "/home/Projects/SCM/bzr/bzr.dev/bzrlib/branch.py", line 588, in get_revis
ion_xml_file
    raise bzrlib.errors.NoSuchRevision(self, revision_id)
NoSuchRevision: Branch Branch(u'/home/Projects/SCM/test-bzr/foo.dev') has no rev
ision metze at samba.org-20050914084421-74dfaea0667d827d



- --
metze

Stefan Metzmacher <metze at samba.org> www.samba.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3-nr1 (Windows XP)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDJ+UXm70gjA5TCD8RAklpAKCTB63lkV/d/NsreZBDoW1MkhgU+gCfXSKy
GNSoAEa1jxRwGUjnJhVjRXQ=
=aEIj
-----END PGP SIGNATURE-----