[Pkg-bazaar-commits] ./bzr/unstable r913: - merge aaron's merge-rename fix

[Martin Pool]

------------------------------------------------------------
revno: 913
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-07-12 09:13:33 +1000
message:
  - merge aaron's merge-rename fix
modified:
  bzrlib/changeset.py
  bzrlib/merge_core.py
-------------- next part --------------
=== modified file 'bzrlib/changeset.py'
--- a/bzrlib/changeset.py	2005-07-07 08:02:16 +0000
+++ b/bzrlib/changeset.py	2005-07-11 23:13:33 +0000
@@ -17,6 +17,7 @@
 import errno
 import patch
 import stat
+from bzrlib.trace import mutter
 """
 Represent and apply a changeset
 """
@@ -693,6 +694,7 @@
         :type reverse: bool
         :rtype: str
         """
+        mutter("Finding new path for %s" % self.summarize_name(changeset))
         if reverse:
             parent = self.parent
             to_dir = self.dir
@@ -717,6 +719,7 @@
         if from_dir == to_dir:
             dir = os.path.dirname(id_map[self.id])
         else:
+            mutter("path, new_path: %r %r" % (self.path, self.new_path))
             parent_entry = changeset.entries[parent]
             dir = parent_entry.get_new_path(id_map, changeset, reverse)
         if from_name == to_name:

=== modified file 'bzrlib/merge_core.py'
--- a/bzrlib/merge_core.py	2005-07-07 08:02:16 +0000
+++ b/bzrlib/merge_core.py	2005-07-11 23:13:33 +0000
@@ -59,6 +59,7 @@
     return new_cset
 
 def make_merged_entry(entry, inventory, conflict_handler):
+    from bzrlib.trace import mutter
     this_name = inventory.this.get_name(entry.id)
     this_parent = inventory.this.get_parent(entry.id)
     this_dir = inventory.this.get_dir(entry.id)
@@ -75,7 +76,8 @@
     other_dir = inventory.base.get_dir(entry.id)
     if other_dir is None:
         other_dir = ""
-
+    mutter("Dirs: this, base, other %r %r %r" % (this_dir, base_dir, other_dir))
+    mutter("Names: this, base, other %r %r %r" % (this_name, base_name, other_name))
     if base_name == other_name:
         old_name = this_name
         new_name = this_name
@@ -104,12 +106,13 @@
         old_path = os.path.join(old_dir, old_name)
     else:
         old_path = None
-    new_entry = changeset.ChangesetEntry(entry.id, old_parent, old_name)
+    new_entry = changeset.ChangesetEntry(entry.id, old_parent, old_path)
     if new_name is not None and new_parent is not None:
         new_entry.new_path = os.path.join(new_dir, new_name)
     else:
         new_entry.new_path = None
     new_entry.new_parent = new_parent
+    mutter(repr(new_entry))
     return new_entry