Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-rename-merge1.out @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | ae85272b59a4 |
children | e7abcf3a7c5f |
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 |
3295
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3280
diff
changeset
|
23 rev offset length base linkrev nodeid p1 p2 |
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3280
diff
changeset
|
24 0 0 67 0 1 dc51707dfc98 000000000000 000000000000 |
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3280
diff
changeset
|
25 1 67 72 1 3 b2494a44f0a9 000000000000 dc51707dfc98 |
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3280
diff
changeset
|
26 renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 |