Mercurial > hg
annotate tests/test-backout.out @ 2175:b2ae81a7df29
Make hg update more verbose by default (issue12)
(including small changes to revert and backout to not show these stats
with the exception of backout --merge)
Show update stats (unless -q), e.g.:
K files updated, L files merged, M files removed, N files unresolved
Inform the user what to do after a merge:
(branch merge, don't forget to commit)
Inform the user what to do if a branch merge failed:
There are unresolved merges, you can redo the full merge using:
hg update -C X
hg merge Y
Inform the user what to do if a working directory merge failed:
There are unresolved merges with locally modified files.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 02 May 2006 18:44:02 +0200 |
parents | ec96c4518236 |
children | 6c9305fbebaf |
rev | line source |
---|---|
2158 | 1 # basic operation |
2 adding a | |
3 changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57 | |
4 a | |
5 # file that was removed is recreated | |
6 adding a | |
7 adding a | |
8 changeset 2:44cd84c7349a backs out changeset 1:76862dcce372 | |
9 content | |
10 # backout of backout is as if nothing happened | |
11 removing a | |
12 changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a | |
13 cat: a: No such file or directory | |
14 # backout with merge | |
15 adding a | |
16 changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23 | |
17 merging with changeset 2:b66ea5b77abb | |
18 merging a | |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2158
diff
changeset
|
19 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2158
diff
changeset
|
20 (branch merge, don't forget to commit) |
2158 | 21 line 1 |