changeset 8037:ffbebfb6b8d4

Merge with crew-stable

--- a/hgext/convert/bzr.py	Wed Apr 08 22:07:20 2009 +0200
+++ b/hgext/convert/bzr.py	Wed Apr 08 23:24:22 2009 +0200
@@ -181,6 +181,7 @@
             # renamed
             if path and path != topath:
                 renames[topath] = path
+                changes.append((path, revid))
 
             # populate the mode cache
             kind, executable = [e[1] for e in (kind, executable)]

--- a/tests/test-convert-bzr	Wed Apr 08 22:07:20 2009 +0200
+++ b/tests/test-convert-bzr	Wed Apr 08 23:24:22 2009 +0200
@@ -8,15 +8,19 @@
 bzr init -q source
 cd source
 echo a > a
-bzr add -q a
-bzr commit -q -m 'Initial add: a'
+echo c > c
+bzr add -q a c
+bzr commit -q -m 'Initial add: a, c'
 bzr mv a b
+bzr mv c d
 echo a2 >> a
 bzr add -q a
-bzr commit -q -m 'rename a into b, create a'
+bzr commit -q -m 'rename a into b, create a, rename c into d'
 cd ..
 hg convert source source-hg
 glog -R source-hg
+echo "% manifest"
+hg manifest -R source-hg -r tip
 echo "% test --rev option"
 hg convert -r 1 source source-1-hg
 glog -R source-1-hg

--- a/tests/test-convert-bzr.out	Wed Apr 08 22:07:20 2009 +0200
+++ b/tests/test-convert-bzr.out	Wed Apr 08 23:24:22 2009 +0200
@@ -1,22 +1,27 @@
 % create and rename on the same file in the same step
 a => b
+c => d
 initializing destination source-hg repository
 scanning source...
 sorting...
 converting...
-1 Initial add: a
-0 rename a into b, create a
-o  1 "rename a into b, create a" files: a b
+1 Initial add: a, c
+0 rename a into b, create a, rename c into d
+o  1 "rename a into b, create a, rename c into d" files: a b c d
 |
-o  0 "Initial add: a" files: a
+o  0 "Initial add: a, c" files: a c
 
+% manifest
+a
+b
+d
 % test --rev option
 initializing destination source-1-hg repository
 scanning source...
 sorting...
 converting...
-0 Initial add: a
-o  0 "Initial add: a" files: a
+0 Initial add: a, c
+o  0 "Initial add: a, c" files: a c
 
 % merge
 initializing destination source-hg repository