##// 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:

r8168:8766fee6 default
r10378:e1401c74 default
Show More
test-rebase-abort
44 lines | 811 B | text/plain | TextLexer
/ tests / test-rebase-abort
Stefano Tortarolo
Add rebase extension
r6906 #!/bin/sh
echo "[extensions]" >> $HGRCPATH
echo "graphlog=" >> $HGRCPATH
echo "rebase=" >> $HGRCPATH
Brendan Cully
Debashify rebase tests
r6910 cleanoutput () {
Stefano Tortarolo
Add rebase extension
r6906 sed -e 's/\(Rebase status stored to\).*/\1/' \
-e 's/\(Rebase status restored from\).*/\1/' \
-e 's/\(saving bundle to \).*/\1/'
}
hg init a
cd a
echo 'c1' >common
hg add common
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '0 0' -m "C1"
Stefano Tortarolo
Add rebase extension
r6906
echo 'c2' >>common
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '1 0' -m "C2"
Stefano Tortarolo
Add rebase extension
r6906
echo 'c3' >>common
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '2 0' -m "C3"
Stefano Tortarolo
Add rebase extension
r6906
hg update -C 1
echo 'l1' >>extra
hg add extra
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '3 0' -m "L1"
Stefano Tortarolo
Add rebase extension
r6906
sed -e 's/c2/l2/' common > common.new
mv common.new common
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d '4 0' -m "L2"
Stefano Tortarolo
Add rebase extension
r6906
hg glog --template '{rev}: {desc}\n'
echo
echo '% Conflicting rebase'
hg rebase -s 3 -d 2 2>&1 | cleanoutput
echo
echo '% Abort'
hg rebase --abort 2>&1 | cleanoutput
hg glog --template '{rev}: {desc}\n'