##// END OF EJS Templates
subrepo: change default path in hgrc of subrepo after cloning...
subrepo: change default path in hgrc of subrepo after cloning Previous behavior was to put in the cloned subrepos the path found in the original main repo. However it isn't valid for relative path and it seems more logical to reference instead the subrepos working copy path of the original main repo.

File last commit:

r4659:7a7d4937 default
r10378:e1401c74 default
Show More
test-empty-file
25 lines | 422 B | text/plain | TextLexer
Alexis S. L. Carvalho
Test that we notice the empty files from the second parent during a merge...
r3509 #!/bin/sh
hg init a
cd a
touch empty1
hg add empty1
hg commit -m 'add empty1' -d '1000000 0'
touch empty2
hg add empty2
hg commit -m 'add empty2' -d '1000000 0'
hg up -C 0
touch empty3
hg add empty3
hg commit -m 'add empty3' -d '1000000 0'
hg heads
hg merge 1
Thomas Arendsen Hein
Kill trailing spaces
r4659 # before changeset 05257fd28591, we didn't notice the
Alexis S. L. Carvalho
Test that we notice the empty files from the second parent during a merge...
r3509 # empty file that came from rev 1.
hg status
hg commit -m merge -d '1000000 0'
Matt Mackall
make manifest friendlier...
r3736 hg manifest --debug tip