##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r11208:2313dc4d default
r12278:c4c2ba55 merge default
Show More
test-rebase-parameters
110 lines | 2.0 KiB | text/plain | TextLexer
/ tests / test-rebase-parameters
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 "rebase=" >> $HGRCPATH
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 hg init a
cd a
addcommit "c1" 0
addcommit "c2" 1
addcommit "c3" 2
hg update -C 1
addcommit "l1" 3
addcommit "l2" 4
addcommit "l3" 5
hg update -C 2
addcommit "r1" 6
addcommit "r2" 7
}
Stefano Tortarolo
Fix wrong redirection in test-rebase-parameters
r6939 createrepo > /dev/null 2>&1
Stefano Tortarolo
Add rebase extension
r6906 echo "% These fail"
echo
echo "% Use continue and abort"
hg rebase --continue --abort
echo
echo "% Use continue and collapse"
hg rebase --continue --collapse
echo
echo "% Use continue/abort and dest/source"
hg rebase --continue --dest 4
echo
echo "% Use source and base"
hg rebase --base 5 --source 4
echo
echo "% Rebase with no arguments - from current"
hg rebase
echo
echo "% Rebase with no arguments - from the current branch"
hg update 6
hg rebase
echo "% ----------"
echo "% These work"
echo
echo "% Rebase with no arguments (from 3 onto 7)"
hg update -C 5
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase 2>&1 | hidebackup
Stefano Tortarolo
Add rebase extension
r6906
Stefano Tortarolo
rebase: disable rollback after rebasing
r7130 echo "% Try to rollback after a rebase (fail)"
hg rollback
Stefano Tortarolo
Fix wrong redirection in test-rebase-parameters
r6939 createrepo > /dev/null 2>&1
Stefano Tortarolo
Add rebase extension
r6906 echo
echo "% Rebase with base == '.' => same as no arguments (from 3 onto 7)"
hg update -C 5
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase --base . | hidebackup
Stefano Tortarolo
Add rebase extension
r6906
Stefano Tortarolo
Fix wrong redirection in test-rebase-parameters
r6939 createrepo > /dev/null 2>&1
Stefano Tortarolo
Add rebase extension
r6906 echo
echo "% Rebase with dest == `hg branch` => same as no arguments (from 3 onto 7)"
hg update -C 5
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase --dest `hg branch` | hidebackup
Stefano Tortarolo
Add rebase extension
r6906
Stefano Tortarolo
Fix wrong redirection in test-rebase-parameters
r6939 createrepo > /dev/null 2>&1
Stefano Tortarolo
Add rebase extension
r6906 echo
echo "% Specify only source (from 4 onto 7)"
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase --source 4 | hidebackup
Stefano Tortarolo
Add rebase extension
r6906
Stefano Tortarolo
Fix wrong redirection in test-rebase-parameters
r6939 createrepo > /dev/null 2>&1
Stefano Tortarolo
Add rebase extension
r6906 echo
echo "% Specify only dest (from 3 onto 6)"
hg update -C 5
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase --dest 6 | hidebackup
Stefano Tortarolo
Add rebase extension
r6906
Stefano Tortarolo
Fix wrong redirection in test-rebase-parameters
r6939 createrepo > /dev/null 2>&1
Stefano Tortarolo
Add rebase extension
r6906 echo
echo "% Specify only base (from 3 onto 7)"
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase --base 5 | hidebackup
Stefano Tortarolo
Add rebase extension
r6906
Stefano Tortarolo
Fix wrong redirection in test-rebase-parameters
r6939 createrepo > /dev/null 2>&1
Stefano Tortarolo
Add rebase extension
r6906 echo
echo "% Specify source and dest (from 4 onto 6)"
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase --source 4 --dest 6 | hidebackup
Stefano Tortarolo
Add rebase extension
r6906
Stefano Tortarolo
Fix wrong redirection in test-rebase-parameters
r6939 createrepo > /dev/null 2>&1
Stefano Tortarolo
Add rebase extension
r6906 echo
echo "% Specify base and dest (from 3 onto 6)"
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase --base 4 --dest 6 | hidebackup
Stefano Tortarolo
Add rebase extension
r6906
exit 0