Show More
@@ -427,7 +427,7 b' def manifestmerge(repo, wctx, p2, pa, br' | |||
|
427 | 427 | fla = ma.flags(f) |
|
428 | 428 | nol = 'l' not in fl1 + fl2 + fla |
|
429 | 429 | if n2 == a and fl2 == fla: |
|
430 |
actions['k'].append((f, (), " |
|
|
430 | actions['k'].append((f, (), "remote unchanged")) | |
|
431 | 431 | elif n1 == a and fl1 == fla: # local unchanged - use remote |
|
432 | 432 | if n1 == n2: # optimization: keep local content |
|
433 | 433 | actions['e'].append((f, (fl2,), "update permissions")) |
@@ -168,7 +168,7 b' Graft out of order, skipping a merge and' | |||
|
168 | 168 | e: remote is newer -> g |
|
169 | 169 | getting e |
|
170 | 170 | updating: e 1/1 files (100.00%) |
|
171 |
b: |
|
|
171 | b: remote unchanged -> k | |
|
172 | 172 | e |
|
173 | 173 | grafting revision 4 |
|
174 | 174 | searching for copies back to rev 1 |
@@ -179,7 +179,7 b' Graft out of order, skipping a merge and' | |||
|
179 | 179 | d: remote is newer -> g |
|
180 | 180 | getting d |
|
181 | 181 | updating: d 1/2 files (50.00%) |
|
182 |
b: |
|
|
182 | b: remote unchanged -> k | |
|
183 | 183 | e: versions differ -> m |
|
184 | 184 | updating: e 2/2 files (100.00%) |
|
185 | 185 | picked tool 'internal:merge' for e (binary False symlink False) |
@@ -40,7 +40,7 b' http://mercurial.selenic.com/bts/issue67' | |||
|
40 | 40 | 1a: remote created -> g |
|
41 | 41 | getting 1a |
|
42 | 42 | updating: 1a 2/2 files (100.00%) |
|
43 |
2: |
|
|
43 | 2: remote unchanged -> k | |
|
44 | 44 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
45 | 45 | (branch merge, don't forget to commit) |
|
46 | 46 |
@@ -141,7 +141,7 b' Redo merge with merge.preferancestor="*"' | |||
|
141 | 141 | resolving manifests |
|
142 | 142 | branchmerge: True, force: False, partial: False |
|
143 | 143 | ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
|
144 |
f2: |
|
|
144 | f2: remote unchanged -> k | |
|
145 | 145 | f1: versions differ -> m |
|
146 | 146 | |
|
147 | 147 | auction for merging merge bids |
@@ -152,7 +152,7 b' Redo merge with merge.preferancestor="*"' | |||
|
152 | 152 | f1: remote is newer -> g |
|
153 | 153 | getting f1 |
|
154 | 154 | updating: f1 1/1 files (100.00%) |
|
155 |
f2: |
|
|
155 | f2: remote unchanged -> k | |
|
156 | 156 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
157 | 157 | (branch merge, don't forget to commit) |
|
158 | 158 | |
@@ -176,7 +176,7 b' The other way around:' | |||
|
176 | 176 | resolving manifests |
|
177 | 177 | branchmerge: True, force: False, partial: False |
|
178 | 178 | ancestor: 0f6b37dbe527, local: adfe50279922+, remote: 3b08d01b0ab5 |
|
179 |
f1: |
|
|
179 | f1: remote unchanged -> k | |
|
180 | 180 | f2: versions differ -> m |
|
181 | 181 | |
|
182 | 182 | calculating bids for ancestor 40663881a6dd |
@@ -195,7 +195,7 b' The other way around:' | |||
|
195 | 195 | f2: remote is newer -> g |
|
196 | 196 | getting f2 |
|
197 | 197 | updating: f2 1/1 files (100.00%) |
|
198 |
f1: |
|
|
198 | f1: remote unchanged -> k | |
|
199 | 199 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
200 | 200 | (branch merge, don't forget to commit) |
|
201 | 201 | |
@@ -249,7 +249,7 b' Verify how the output looks and and how ' | |||
|
249 | 249 | resolving manifests |
|
250 | 250 | branchmerge: True, force: False, partial: False |
|
251 | 251 | ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
|
252 |
f2: |
|
|
252 | f2: remote unchanged -> k | |
|
253 | 253 | f1: versions differ -> m |
|
254 | 254 | |
|
255 | 255 | auction for merging merge bids |
@@ -260,7 +260,7 b' Verify how the output looks and and how ' | |||
|
260 | 260 | f1: remote is newer -> g |
|
261 | 261 | getting f1 |
|
262 | 262 | updating: f1 1/1 files (100.00%) |
|
263 |
f2: |
|
|
263 | f2: remote unchanged -> k | |
|
264 | 264 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
265 | 265 | (branch merge, don't forget to commit) |
|
266 | 266 |
@@ -88,7 +88,7 b' args:' | |||
|
88 | 88 | ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
|
89 | 89 | preserving a for resolve of b |
|
90 | 90 | preserving rev for resolve of rev |
|
91 |
a: |
|
|
91 | a: remote unchanged -> k | |
|
92 | 92 | b: remote copied from a -> m |
|
93 | 93 | updating: b 1/2 files (50.00%) |
|
94 | 94 | picked tool 'python ../merge' for b (binary False symlink False) |
@@ -573,7 +573,7 b' m "um a c" "um x c" " " "10 do merg' | |||
|
573 | 573 | ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
|
574 | 574 | preserving b for resolve of b |
|
575 | 575 | preserving rev for resolve of rev |
|
576 |
a: |
|
|
576 | a: remote unchanged -> k | |
|
577 | 577 | b: both created -> m |
|
578 | 578 | updating: b 1/2 files (50.00%) |
|
579 | 579 | picked tool 'python ../merge' for b (binary False symlink False) |
General Comments 0
You need to be logged in to leave comments.
Login now