Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-backout.out @ 2407:8fe3d60b7f19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert: better fix for not printing 'reverting' message
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 07 Jun 2006 13:16:25 -0700
parents 78e7fd16f472
children 2f4addf56715
comparison
equal deleted inserted replaced
2406:4a678e408ce5 2407:8fe3d60b7f19
1 # basic operation 1 # basic operation
2 adding a 2 adding a
3 reverting a
3 changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57 4 changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57
4 a 5 a
5 # file that was removed is recreated 6 # file that was removed is recreated
6 adding a 7 adding a
7 adding a 8 adding a
11 removing a 12 removing a
12 changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a 13 changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a
13 cat: a: No such file or directory 14 cat: a: No such file or directory
14 # backout with merge 15 # backout with merge
15 adding a 16 adding a
17 reverting a
16 changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23 18 changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23
17 merging with changeset 2:b66ea5b77abb 19 merging with changeset 2:b66ea5b77abb
18 merging a 20 merging a
19 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 21 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
20 (branch merge, don't forget to commit) 22 (branch merge, don't forget to commit)