##// END OF EJS Templates
test-convert-bzr: check renamed files are removed (issue1505)
Patrick Mezard -
r8036:dbcf5d52 default
parent child Browse files
Show More
@@ -8,15 +8,19 b' cd test-createandrename'
8 bzr init -q source
8 bzr init -q source
9 cd source
9 cd source
10 echo a > a
10 echo a > a
11 bzr add -q a
11 echo c > c
12 bzr commit -q -m 'Initial add: a'
12 bzr add -q a c
13 bzr commit -q -m 'Initial add: a, c'
13 bzr mv a b
14 bzr mv a b
15 bzr mv c d
14 echo a2 >> a
16 echo a2 >> a
15 bzr add -q a
17 bzr add -q a
16 bzr commit -q -m 'rename a into b, create a'
18 bzr commit -q -m 'rename a into b, create a, rename c into d'
17 cd ..
19 cd ..
18 hg convert source source-hg
20 hg convert source source-hg
19 glog -R source-hg
21 glog -R source-hg
22 echo "% manifest"
23 hg manifest -R source-hg -r tip
20 echo "% test --rev option"
24 echo "% test --rev option"
21 hg convert -r 1 source source-1-hg
25 hg convert -r 1 source source-1-hg
22 glog -R source-1-hg
26 glog -R source-1-hg
@@ -1,22 +1,27 b''
1 % create and rename on the same file in the same step
1 % create and rename on the same file in the same step
2 a => b
2 a => b
3 c => d
3 initializing destination source-hg repository
4 initializing destination source-hg repository
4 scanning source...
5 scanning source...
5 sorting...
6 sorting...
6 converting...
7 converting...
7 1 Initial add: a
8 1 Initial add: a, c
8 0 rename a into b, create a
9 0 rename a into b, create a, rename c into d
9 o 1 "rename a into b, create a" files: a b
10 o 1 "rename a into b, create a, rename c into d" files: a b c d
10 |
11 |
11 o 0 "Initial add: a" files: a
12 o 0 "Initial add: a, c" files: a c
12
13
14 % manifest
15 a
16 b
17 d
13 % test --rev option
18 % test --rev option
14 initializing destination source-1-hg repository
19 initializing destination source-1-hg repository
15 scanning source...
20 scanning source...
16 sorting...
21 sorting...
17 converting...
22 converting...
18 0 Initial add: a
23 0 Initial add: a, c
19 o 0 "Initial add: a" files: a
24 o 0 "Initial add: a, c" files: a c
20
25
21 % merge
26 % merge
22 initializing destination source-hg repository
27 initializing destination source-hg repository
General Comments 0
You need to be logged in to leave comments. Login now