##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

addremove: correctly handle intermediate symlinks...
addremove: correctly handle intermediate symlinks This fixes problems mentioned in issue660 comments (unrelated to original issue) where directory was renamed, and symlink was added instead. In such situation addremove wasn't able to correctly detect that old files no longer here, but tried to add symlink (and failed due collision with old files).
Benoit Boissinot - - Load All Authors

File last commit:

r3853:c0b44915 default
r6651:7f0dd352 default
Show More
test-bundle-r
113 lines | 2.1 KiB | text/plain | TextLexer
/ tests / test-bundle-r
History | Source | Raw |Copy content |Copy permalink
Benoit Boissinot
add -r/--rev and --base option to bundle...
 r3284 #!/bin/sh
hg init test
cd test
cat >>afile <<EOF
0
EOF
hg add afile
hg commit -m "0.0" -d "1000000 0"
cat >>afile <<EOF
1
EOF
hg commit -m "0.1" -d "1000000 0"
cat >>afile <<EOF
2
EOF
hg commit -m "0.2" -d "1000000 0"
cat >>afile <<EOF
3
EOF
hg commit -m "0.3" -d "1000000 0"
hg update -C 0
cat >>afile <<EOF
1
EOF
hg commit -m "1.1" -d "1000000 0"
cat >>afile <<EOF
2
EOF
hg commit -m "1.2" -d "1000000 0"
cat >fred <<EOF
a line
EOF
cat >>afile <<EOF
3
EOF
hg add fred
hg commit -m "1.3" -d "1000000 0"
hg mv afile adifferentfile
hg commit -m "1.3m" -d "1000000 0"
hg update -C 3
hg mv afile anotherfile
hg commit -m "0.3m" -d "1000000 0"
Benoit Boissinot
switch to the .hg/store layout, fix the tests
 r3853 hg debugindex .hg/store/data/afile.i
hg debugindex .hg/store/data/adifferentfile.i
hg debugindex .hg/store/data/anotherfile.i
hg debugindex .hg/store/data/fred.i
hg debugindex .hg/store/00manifest.i
Benoit Boissinot
add -r/--rev and --base option to bundle...
 r3284 hg verify
cd ..
for i in 0 1 2 3 4 5 6 7 8; do
mkdir test-"$i"
hg --cwd test-"$i" init
hg -R test bundle -r "$i" test-"$i".hg test-"$i"
cd test-"$i"
hg unbundle ../test-"$i".hg
hg verify
hg tip -q
cd ..
done
cd test-8
hg pull ../test-7
hg verify
hg rollback
cd ..
echo % should fail
hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3
hg -R test bundle -r tip test-bundle-branch1.hg
hg -R test bundle --base 2 -r tip test-bundle-branch1.hg
hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg
hg -R test bundle --base 2 test-bundle-all.hg
hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg
Benoit Boissinot
nodesbetween: fix a bug with duplicate heads
 r3360
# issue76 msg2163
hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg
Benoit Boissinot
bundle --base: use the right set for the base
 r3318 hg clone test-2 test-9
cd test-9
Benoit Boissinot
add -r/--rev and --base option to bundle...
 r3284 echo % 2
hg tip -q
hg unbundle ../test-bundle-should-fail.hg
echo % 2
hg tip -q
hg unbundle ../test-bundle-all.hg
echo % 8
hg tip -q
Benoit Boissinot
bundle --base: use the right set for the base
 r3318 hg verify
Benoit Boissinot
add -r/--rev and --base option to bundle...
 r3284 hg rollback
echo % 2
hg tip -q
hg unbundle ../test-bundle-branch1.hg
echo % 4
hg tip -q
Benoit Boissinot
bundle --base: use the right set for the base
 r3318 hg verify
hg rollback
Benoit Boissinot
add -r/--rev and --base option to bundle...
 r3284 hg unbundle ../test-bundle-branch2.hg
Benoit Boissinot
bundle --base: use the right set for the base
 r3318 echo % 6
Benoit Boissinot
add -r/--rev and --base option to bundle...
 r3284 hg tip -q
hg verify
Benoit Boissinot
bundle --base: use the right set for the base
 r3318
cd ../test
hg merge 7
hg ci -m merge -d "1000000 0"
cd ..
hg -R test bundle --base 2 test-bundle-head.hg
hg clone test-2 test-10
cd test-10
hg unbundle ../test-bundle-head.hg
echo % 9
hg tip -q
hg verify