view tests/test-backout.out @ 2493:9c660e691e90

print message after backout that tells that backout adds new head.
author Vadim Gelfer <>
date Fri, 23 Jun 2006 17:33:10 -0700
parents 2f4addf56715
children fc0ec2b64150
line wrap: on
line source

# basic operation
adding a
reverting a
changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57
# file that was removed is recreated
adding a
adding a
changeset 2:44cd84c7349a backs out changeset 1:76862dcce372
# backout of backout is as if nothing happened
removing a
changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a
cat: a: No such file or directory
# backout with merge
adding a
reverting a
changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23
merging with changeset 2:b66ea5b77abb
merging a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
line 1
# backout should not back out subsequent changesets
adding a
adding b
reverting a
changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5
the backout changeset is a new head - do not forget to merge
(use "backout -m" if you want to auto-merge)
b: No such file or directory