Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge1.out @ 3134:4bf2e895cf86
filectx: add rename-aware ancestor algorithm
This code works but may trigger recursion depth issues
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 19 Sep 2006 14:58:54 -0500 |
parents | a31557193f3c |
children | 966632304dde 49966b5ab16f |
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 |
3002
a31557193f3c
merge: simplify working dir manifest generation
Matt Mackall <mpm@selenic.com>
parents:
2175
diff
changeset
|
3 merging for b |
a31557193f3c
merge: simplify working dir manifest generation
Matt Mackall <mpm@selenic.com>
parents:
2175
diff
changeset
|
4 merging b |
a31557193f3c
merge: simplify working dir manifest generation
Matt Mackall <mpm@selenic.com>
parents:
2175
diff
changeset
|
5 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1995
diff
changeset
|
6 (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
|
7 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
|
8 %% 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
|
9 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
|
10 %% merge of b expected |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
11 merging for b |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
12 merging b |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1995
diff
changeset
|
13 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
|
14 (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
|
15 %% |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1995
diff
changeset
|
16 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
|
17 Contents of b should be "this is file b1" |
430 | 18 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
|
19 %% merge fails |
1995
2da2d46862fb
Spelling fix: "commited" -> "committed"
mcmillen@cs.cmu.edu
parents:
1581
diff
changeset
|
20 abort: outstanding uncommitted changes |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
925
diff
changeset
|
21 %% merge expected! |
430 | 22 merging for b |
23 merging b | |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1995
diff
changeset
|
24 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
|
25 (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
|
26 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
|
27 %% merge of b should fail |
1995
2da2d46862fb
Spelling fix: "commited" -> "committed"
mcmillen@cs.cmu.edu
parents:
1581
diff
changeset
|
28 abort: outstanding uncommitted changes |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
925
diff
changeset
|
29 %% merge of b expected |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
30 merging for b |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
31 merging b |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1995
diff
changeset
|
32 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
|
33 (branch merge, don't forget to commit) |