At lp:~bzr/bzr/1.12-lca-deleted
------------------------------------------------------------
revno: 3950
revision-id: v.ladeuil+lp at free.fr-20090121103302-tx6xsuogm6kga9jt
parent: john at arbash-meinel.com-20090120181350-wzl4x01ns3rly9y5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: spurious-conflicts
timestamp: Wed 2009-01-21 11:33:02 +0100
message:
* bzrlib/merge.py:
(Merger.find_base): Add some mutter calls to help debug.
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py 2009-01-20 18:13:50 +0000
+++ b/bzrlib/merge.py 2009-01-21 10:33:02 +0000
@@ -390,6 +390,7 @@
if self._is_criss_cross:
warning('Warning: criss-cross merge encountered. See bzr'
' help criss-cross.')
+ mutter('Criss-cross lcas: %r' % lcas)
interesting_revision_ids = [self.base_rev_id]
interesting_revision_ids.extend(lcas)
interesting_trees = dict((t.get_revision_id(), t)
@@ -405,6 +406,7 @@
self.base_tree = self.revision_tree(self.base_rev_id)
self.base_is_ancestor = True
self.base_is_other_ancestor = True
+ mutter('Base revid: %r' % self.base_rev_id)
def set_base(self, base_revision):
"""Set the base revision to use for the merge.