Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-backout.out @ 2619:fc0ec2b64150

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update test-backout.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sat, 15 Jul 2006 09:19:40 -0700
parents 9c660e691e90
children 2ace3bf43089
comparison
equal deleted inserted replaced
2618:8367b67ad397 2619:fc0ec2b64150
27 reverting a 27 reverting a
28 changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5 28 changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5
29 the backout changeset is a new head - do not forget to merge 29 the backout changeset is a new head - do not forget to merge
30 (use "backout -m" if you want to auto-merge) 30 (use "backout -m" if you want to auto-merge)
31 b: No such file or directory 31 b: No such file or directory
32 adding a
33 adding b
34 adding c
35 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
36 adding d
37 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
38 (branch merge, don't forget to commit)
39 # backout of merge should fail
40 abort: cannot back out a merge changeset without --parent
41 # backout of merge with bad parent should fail
42 abort: cb9a9f314b8b is not a parent of b2f3bb92043e
43 # backout of non-merge with parent should fail
44 abort: cannot use --parent on non-merge changeset
45 # backout with valid parent should be ok
46 removing d
47 changeset 5:11fbd9be634c backs out changeset 4:b2f3bb92043e
48 rolling back last transaction
49 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
50 removing c
51 changeset 5:1a5f1a63bf2c backs out changeset 4:b2f3bb92043e