Mercurial > hg

comparison tests/test-backout @ 5568:de620356064f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout: disallow across branches (issue655)
author Matt Mackall <mpm@selenic.com>
date Sat, 01 Dec 2007 13:09:27 -0600
parents f6e961c0155b
children bc1ba9124799
comparison
equal deleted inserted replaced
5567:56e9f7b2d8fa 5568:de620356064f
34 34
35 echo '# backout of backout is as if nothing happened' 35 echo '# backout of backout is as if nothing happened'
36 36
37 hg backout -d '3 0' --merge tip 37 hg backout -d '3 0' --merge tip
38 cat a 2>/dev/null || echo cat: a: No such file or directory 38 cat a 2>/dev/null || echo cat: a: No such file or directory
39
40 echo '# across branch'
41 cd ..
42 hg init branch
43 cd branch
44 echo a > a
45 hg ci -Am0 -d '0 0'
46 echo b > b
47 hg ci -Am1 -d '0 0'
48 hg co -C 0
49 # should fail
50 hg backout -d '0 0' 1
51 echo c > c
52 hg ci -Am2 -d '0 0'
53 # should fail
54 hg backout -d '0 0' 1
39 55
40 echo '# backout with merge' 56 echo '# backout with merge'
41 cd .. 57 cd ..
42 hg init merge 58 hg init merge
43 cd merge 59 cd merge