tests/test-backout.out
author Matt Mackall <mpm@selenic.com>
Wed, 10 May 2006 16:55:55 -0500
changeset 2252 ba7afc7dd901
parent 2175 b2ae81a7df29
child 2268 6c9305fbebaf
permissions -rw-r--r--
Added tag 0.9 for changeset 35fb62a3a673d5322f6274a44ba6456e5e4b3b37

# basic operation
adding a
changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57
a
# file that was removed is recreated
adding a
adding a
changeset 2:44cd84c7349a backs out changeset 1:76862dcce372
content
# 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
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