comparison tests/test-backout.out @ 10882:f0bfe42c7b1f

rollback: add dry-run argument, emit transaction description
author Steve Borho <steve@borho.org>
date Fri, 09 Apr 2010 17:23:37 -0500
parents 708938509732
children 468876bc3885
comparison
equal deleted inserted replaced
10881:a685011ed38e 10882:f0bfe42c7b1f
60 # backout of non-merge with parent should fail 60 # backout of non-merge with parent should fail
61 abort: cannot use --parent on non-merge changeset 61 abort: cannot use --parent on non-merge changeset
62 # backout with valid parent should be ok 62 # backout with valid parent should be ok
63 removing d 63 removing d
64 changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e 64 changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e
65 rolling back last transaction 65 rolling back commit to revision 5
66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
67 removing c 67 removing c
68 changeset 5:033590168430 backs out changeset 4:b2f3bb92043e 68 changeset 5:033590168430 backs out changeset 4:b2f3bb92043e
69 # named branches 69 # named branches
70 adding default 70 adding default