test-backout.out
21 lines
| 617 B
| text/plain
|
TextLexer
/ tests / test-backout.out
|
r2158 | # basic operation | ||
adding a | ||||
|
r2303 | changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57 | ||
|
r2158 | a | ||
# file that was removed is recreated | ||||
adding a | ||||
adding a | ||||
|
r2303 | changeset 2:44cd84c7349a backs out changeset 1:76862dcce372 | ||
|
r2158 | content | ||
# backout of backout is as if nothing happened | ||||
removing a | ||||
|
r2303 | changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a | ||
|
r2158 | cat: a: No such file or directory | ||
# backout with merge | ||||
adding a | ||||
|
r2303 | changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23 | ||
|
r2158 | merging with changeset 2:b66ea5b77abb | ||
merging a | ||||
|
r2175 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
|
r2158 | line 1 | ||