Problems with revno 1110

[Magnus Therning]

I ran into some problems after pulling in the latest changes to bzr:

 $ bzr branch bzr.dev bzr.my
 Added 1868 texts.
 Added 1110 inventories.
 Added 0 texts.
 Added 0 inventories.
 bzr: Failed to install john at arbash-meinel.com-20050711051006-2d11704675600e95
 bzr: Failed to install abentley at panoramicfeedback.com-20050726140611-403e366f3c79c1f1
 bzr: Failed to install mbp at sourcefrog.net-20050707075712-4784aa908809b905
 bzr: Failed to install aaron.bentley at utoronto.ca-20050823052551-f3401a8b57d9126f
 bzr: Failed to install mbp at sourcefrog.net-20050707101437-33cd322eed99d580
 bzr: Failed to install john at arbash-meinel.com-20050709180338-33e3b5a778df9104
 bzr: Failed to install aaron.bentley at utoronto.ca-20050730014438-40cca84c284159ce
 bzr: Failed to install abentley at panoramicfeedback.com-20050715134354-78f2bca607acb415

 $ cd bzrtools
 $ bzr pull
 Using last location:
 http://www.panoramicfeedback.com/opensource/bzrtools
 comparing histories
 bzr: ERROR: global name 'is_ancestor' is not defined
   at /home/magnus/prog/bazaarng/bzr.dev/bzrlib/merge.py line 281, in merge()
   see ~/.bzr.log for debug information

The following change didn't fix it completely :(

*** modified file 'bzrlib/merge.py'
--- bzrlib/merge.py
+++ bzrlib/merge.py
@@ -22,6 +22,7 @@
 import bzrlib.osutils
 from bzrlib.errors import BzrCommandError, UnrelatedBranches
 from bzrlib.delta import compare_trees
+from bzrlib.revision import is_ancestor
 from trace import mutter, warning
 import os.path
 import tempfile

 $ cd bzrtools
 $ bzr pull
 Using last location:
 http://www.panoramicfeedback.com/opensource/bzrtools comparing histories
 0 conflicts encountered.

I am sure there aren't any conflicts introduced by me (no files are
changed).

/M

-- 
Magnus Therning                    (OpenPGP: 0xAB4DFBA4)
magnus at therning.org
http://therning.org/magnus

Software is not manufactured, it is something you write and publish.
Keep Europe free from software patents, we do not want censorship
by patent law on written works.

This is an era when nonsense has become acceptable ad sanity is
controversial. Too many people fail to see a distinction between "rule of
the law" and the edicts of judges. Unfortunately, these people include many
judges.
     -- Thomas Sowell, in 1996
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050825/52f19cb0/attachment.pgp