##// END OF EJS Templates
Issue919: add a standard extension to recreate hardlinks between repositories....
Issue919: add a standard extension to recreate hardlinks between repositories. Having to run a standalone Python script from the contrib dir is a nuisance. Also makes various improvements to locking, file discovery, etc. Should also update: http://www.selenic.com/mercurial/wiki/index.cgi/RecreateHardlinksBetweenRepositories

File last commit:

r8168:8766fee6 default
r9729:aa9ccab5 default
Show More
test-merge10
33 lines | 640 B | text/plain | TextLexer
Giorgos Keramidas
tests: add merge test for changeset 9fe267f77f56...
r4696 #!/bin/sh
# Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb
# (merge correctly when all the files in a directory are moved
# but then local changes are added in the same directory)
hg init a
cd a
mkdir -p testdir
echo a > testdir/a
hg add testdir/a
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '1000000 0' -m a
Giorgos Keramidas
tests: add merge test for changeset 9fe267f77f56...
r4696 cd ..
hg clone a b
cd a
echo alpha > testdir/a
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '1000000 0' -m remote-change
Giorgos Keramidas
tests: add merge test for changeset 9fe267f77f56...
r4696 cd ..
cd b
mkdir testdir/subdir
hg mv testdir/a testdir/subdir/a
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '1000000 0' -m move
Giorgos Keramidas
tests: add merge test for changeset 9fe267f77f56...
r4696 mkdir newdir
echo beta > newdir/beta
hg add newdir/beta
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '1000000 0' -m local-addition
Giorgos Keramidas
tests: add merge test for changeset 9fe267f77f56...
r4696 hg pull ../a
hg up -C 2
hg merge
hg stat
hg diff --nodates