##// END OF EJS Templates
Fix copy in subdirectories...
Fix copy in subdirectories Spotted by Chad Netzer

File last commit:

r749:7e4843b7 default
r781:26f3d353 default
Show More
test-merge4
17 lines | 318 B | text/plain | TextLexer
mpm@selenic.com
[PATCH] Removal of a file added by merging branches...
r416 #!/bin/sh -x
hg init
echo This is file a1 > a
hg add a
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg commit -m "commit #0" -d "0 0"
mpm@selenic.com
[PATCH] Removal of a file added by merging branches...
r416 echo This is file b1 > b
hg add b
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg commit -m "commit #1" -d "0 0"
mpm@selenic.com
[PATCH] Removal of a file added by merging branches...
r416 hg update 0
echo This is file c1 > c
hg add c
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg commit -m "commit #2" -d "0 0"
mpm@selenic.com
[PATCH] Removal of a file added by merging branches...
r416 hg update -m 1
rm b
echo This is file c22 > c
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg commit -m "commit #3" -d "0 0"