Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge1.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 | 2da2d46862fb |
children | a31557193f3c |
rev | line source |
---|---|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1995
diff
changeset
|
1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
925
diff
changeset
|
2 %% no merges expected |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1995
diff
changeset
|
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1995
diff
changeset
|
4 (branch merge, don't forget to commit) |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1995
diff
changeset
|
5 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1581
db10b7114de0
abort when merging two heads and repository has local changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1236
diff
changeset
|
6 %% merge should fail |
db10b7114de0
abort when merging two heads and repository has local changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1236
diff
changeset
|
7 abort: 'b' already exists in the working dir and differs from remote |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
925
diff
changeset
|
8 %% merge of b expected |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
9 merging for b |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
10 merging b |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1995
diff
changeset
|
11 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:
1995
diff
changeset
|
12 (branch merge, don't forget to commit) |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
925
diff
changeset
|
13 %% |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1995
diff
changeset
|
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
925
diff
changeset
|
15 Contents of b should be "this is file b1" |
430 | 16 This is file b1 |
1581
db10b7114de0
abort when merging two heads and repository has local changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1236
diff
changeset
|
17 %% merge fails |
1995
2da2d46862fb
Spelling fix: "commited" -> "committed"
mcmillen@cs.cmu.edu
parents:
1581
diff
changeset
|
18 abort: outstanding uncommitted changes |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
925
diff
changeset
|
19 %% merge expected! |
430 | 20 merging for b |
21 merging b | |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1995
diff
changeset
|
22 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:
1995
diff
changeset
|
23 (branch merge, don't forget to commit) |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1995
diff
changeset
|
24 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1581
db10b7114de0
abort when merging two heads and repository has local changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1236
diff
changeset
|
25 %% merge of b should fail |
1995
2da2d46862fb
Spelling fix: "commited" -> "committed"
mcmillen@cs.cmu.edu
parents:
1581
diff
changeset
|
26 abort: outstanding uncommitted changes |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
925
diff
changeset
|
27 %% merge of b expected |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
28 merging for b |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
29 merging b |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1995
diff
changeset
|
30 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:
1995
diff
changeset
|
31 (branch merge, don't forget to commit) |