##// END OF EJS Templates
Display debugstate dates as '%Y-%m-%d %H:%M:%S'
Display debugstate dates as '%Y-%m-%d %H:%M:%S'

File last commit:

r5568:de620356 default
r5858:e7ed5d07 default
Show More
test-backout
122 lines | 1.8 KiB | text/plain | TextLexer
Vadim Gelfer
add backout command....
r2158 #!/bin/sh
Alexis S. L. Carvalho
change tests to use simplemerge by default
r4365 HGMERGE=true; export HGMERGE
Vadim Gelfer
add backout command....
r2158 hg init basic
cd basic
Thomas Arendsen Hein
Fix and test 'hg backout' without or with too many revisions.
r4726
echo '# should complain'
hg backout
hg backout -r 0 0
echo '# basic operation'
Vadim Gelfer
add backout command....
r2158 echo a > a
hg commit -d '0 0' -A -m a
echo b >> a
hg commit -d '1 0' -m b
hg backout -d '2 0' tip
cat a
echo '# file that was removed is recreated'
cd ..
hg init remove
cd remove
echo content > a
hg commit -d '0 0' -A -m a
hg rm a
hg commit -d '1 0' -m b
hg backout -d '2 0' --merge tip
cat a
echo '# backout of backout is as if nothing happened'
hg backout -d '3 0' --merge tip
TK Soh
tests: fix compatibility on Solaris
r2186 cat a 2>/dev/null || echo cat: a: No such file or directory
Vadim Gelfer
add backout command....
r2158
Matt Mackall
backout: disallow across branches (issue655)
r5568 echo '# across branch'
cd ..
hg init branch
cd branch
echo a > a
hg ci -Am0 -d '0 0'
echo b > b
hg ci -Am1 -d '0 0'
hg co -C 0
# should fail
hg backout -d '0 0' 1
echo c > c
hg ci -Am2 -d '0 0'
# should fail
hg backout -d '0 0' 1
Vadim Gelfer
add backout command....
r2158 echo '# backout with merge'
cd ..
hg init merge
cd merge
echo line 1 > a
hg commit -d '0 0' -A -m a
echo line 2 >> a
hg commit -d '1 0' -m b
echo line 3 >> a
hg commit -d '2 0' -m c
hg backout --merge -d '3 0' 1
hg commit -d '4 0' -m d
cat a
Brendan Cully
Test case for #295
r2492 echo '# backout should not back out subsequent changesets'
hg init onecs
cd onecs
echo 1 > a
hg commit -d '0 0' -A -m a
echo 2 >> a
hg commit -d '1 0' -m b
echo 1 > b
hg commit -d '2 0' -A -m c
hg backout -d '3 0' 1
hg locate b
Vadim Gelfer
backout: allow backout of merge changeset with --parent option....
r2614 cd ..
hg init m
cd m
echo a > a
hg commit -d '0 0' -A -m a
echo b > b
hg commit -d '1 0' -A -m b
echo c > c
hg commit -d '2 0' -A -m b
hg update 1
echo d > d
hg commit -d '3 0' -A -m c
hg merge 2
hg commit -d '4 0' -A -m d
echo '# backout of merge should fail'
hg backout 4
echo '# backout of merge with bad parent should fail'
hg backout --parent 0 4
echo '# backout of non-merge with parent should fail'
hg backout --parent 0 3
echo '# backout with valid parent should be ok'
hg backout -d '5 0' --parent 2 4
hg rollback
hg update -C
hg backout -d '6 0' --parent 3 4
Vadim Gelfer
add backout command....
r2158 exit 0