Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-rename-merge1.out @ 3280:ae85272b59a4
merge: copy fixes and tests
Fix up "already seen" logic
Fix merge action in remote copy case
Add status message
Add lots of merge+copy/move test cases
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 06 Oct 2006 16:55:11 -0500 |
parents | c93ce7f10f85 |
children | 764688cf51e5 |
rev | line source |
---|---|
3155
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 checkout |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 merge |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 resolving manifests |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
5 overwrite None branchmerge True partial False |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
6 ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c |
3257
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
7 a: remote moved -> c |
3155
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
8 b2: remote created -> g |
3280
ae85272b59a4
merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
3257
diff
changeset
|
9 merging a and b to b |
3257
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
10 resolving a |
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
11 my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c |
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
12 copying a to b |
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
13 removing a |
3155
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
14 getting b2 |
3257
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
15 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3155
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
16 (branch merge, don't forget to commit) |
3257
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
17 M b |
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
18 a |
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
19 M b2 |
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
20 R a |
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3155
diff
changeset
|
21 C c2 |
3155
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
22 blahblah |