##// END OF EJS Templates
tests: remove unneeded -d flags...
tests: remove unneeded -d flags Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand.

File last commit:

r11208:2313dc4d default
r12156:4c94b6d0 default
Show More
test-rebase-scenario-global
93 lines | 2.0 KiB | text/plain | TextLexer
/ tests / test-rebase-scenario-global
Stefano Tortarolo
Add rebase extension
r6906 #!/bin/sh
Yuya Nishihara
tests: fix bashism to load helpers.sh...
r11208 . $TESTDIR/helpers.sh
Matt Mackall
rebase: use helpers.sh in tests
r11198
Stefano Tortarolo
Add rebase extension
r6906 echo "[extensions]" >> $HGRCPATH
echo "graphlog=" >> $HGRCPATH
echo "rebase=" >> $HGRCPATH
BASE=`pwd`
Brendan Cully
Debashify rebase tests
r6910 addcommit () {
Stefano Tortarolo
Add rebase extension
r6906 echo $1 > $1
hg add $1
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d "${2} 0" -m $1
Stefano Tortarolo
Add rebase extension
r6906 }
Brendan Cully
Debashify rebase tests
r6910
commit () {
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d "${2} 0" -m $1
Stefano Tortarolo
Add rebase extension
r6906 }
Brendan Cully
Debashify rebase tests
r6910 createrepo () {
Stefano Tortarolo
Add rebase extension
r6906 cd $BASE
rm -rf a
hg init a
cd a
addcommit "A" 0
addcommit "B" 1
hg update -C 0
addcommit "C" 2
hg update -C 0
addcommit "D" 3
hg merge -r 2
commit "E" 4
hg update -C 3
addcommit "F" 5
}
createrepo > /dev/null 2>&1
hg glog --template '{rev}: {desc}\n'
echo '% Rebasing'
echo '% B onto F - simple rebase'
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase -s 1 -d 5 | hidebackup
Stefano Tortarolo
Add rebase extension
r6906 hg glog --template '{rev}: {desc}\n'
createrepo > /dev/null 2>&1
echo '% B onto D - intermediate point'
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase -s 1 -d 3 | hidebackup
Stefano Tortarolo
Add rebase extension
r6906 hg glog --template '{rev}: {desc}\n'
createrepo > /dev/null 2>&1
echo '% C onto F - skip of E'
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase -s 2 -d 5 | hidebackup
Stefano Tortarolo
Add rebase extension
r6906 hg glog --template '{rev}: {desc}\n'
createrepo > /dev/null 2>&1
echo '% D onto C - rebase of a branching point (skip E)'
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase -s 3 -d 2 | hidebackup
Stefano Tortarolo
Add rebase extension
r6906 hg glog --template '{rev}: {desc}\n'
createrepo > /dev/null 2>&1
echo '% E onto F - merged revision having a parent in ancestors of target'
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase -s 4 -d 5 | hidebackup
Stefano Tortarolo
Add rebase extension
r6906 hg glog --template '{rev}: {desc}\n'
createrepo > /dev/null 2>&1
echo '% D onto B - E maintains C as parent'
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase -s 3 -d 1 | hidebackup
Stefano Tortarolo
Add rebase extension
r6906 hg glog --template '{rev}: {desc}\n'
Sune Foldager
rebase: return early when source is descendant of destination...
r9578 echo '% These will fail (using --source)'
Stefano Tortarolo
Add rebase extension
r6906 createrepo > /dev/null 2>&1
echo '% E onto D - rebase onto an ancestor'
hg rebase -s 4 -d 3
echo '% D onto E - rebase onto a descendant'
hg rebase -s 3 -d 4
echo '% E onto B - merge revision with both parents not in ancestors of target'
hg rebase -s 4 -d 1
Sune Foldager
rebase: return early when source is descendant of destination...
r9578 echo
echo '% These will abort gracefully (using --base)'
echo '% E onto E - rebase onto same changeset'
hg rebase -b 4 -d 4
echo '% E onto D - rebase onto an ancestor'
hg rebase -b 4 -d 3
echo '% D onto E - rebase onto a descendant'
hg rebase -b 3 -d 4
Stefano Tortarolo
Add rebase extension
r6906 exit 0