Rev 3511: Add some mutter() calls to help sort out what is going on. in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/merge3_per_file

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/merge3_per_file

------------------------------------------------------------
revno: 3511
revision-id: john at arbash-meinel.com-20080624152907-usuu1b5qmom2fao6
parent: john at arbash-meinel.com-20080621014242-hq64iwxo0ldvayqy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge3_per_file
timestamp: Tue 2008-06-24 10:29:07 -0500
message:
  Add some mutter() calls to help sort out what is going on.
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2008-06-21 01:42:42 +0000
+++ b/bzrlib/merge.py	2008-06-24 15:29:07 +0000
@@ -813,14 +813,17 @@
         other_pair = contents_pair(self.other_tree)
         if base_pair == other_pair:
             # OTHER introduced no changes
+            mutter('BASE == OTHER, not merging: %s', file_id)
             return "unmodified"
         this_pair = contents_pair(self.this_tree)
         if this_pair == other_pair:
             # THIS and OTHER introduced the same changes
+            mutter('THIS == OTHER, not merging: %s', file_id)
             return "unmodified"
         else:
             trans_id = self.tt.trans_id_file_id(file_id)
             if this_pair == base_pair:
+                mutter('THIS == BASE, choosing OTHER: %s', file_id)
                 # only OTHER introduced changes
                 if file_id in self.this_tree:
                     # Remove any existing contents
@@ -839,6 +842,7 @@
                     return "deleted"
             #BOTH THIS and OTHER introduced changes; scalar conflict
             elif this_pair[0] == "file" and other_pair[0] == "file":
+                mutter('THIS != BASE != OTHER, merging: %s', file_id)
                 # THIS and OTHER are both files, so text merge.  Either
                 # BASE is a file, or both converted to files, so at least we
                 # have agreement that output should be a file.