equal
deleted
inserted
replaced
67 $ hg evolve --content-divergent |
67 $ hg evolve --content-divergent |
68 merge:[5] added b |
68 merge:[5] added b |
69 with: [6] added b |
69 with: [6] added b |
70 base: [2] added b |
70 base: [2] added b |
71 rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264 |
71 rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264 |
72 updating to "local" side of the conflict: 7ed0642d644b |
|
73 merging "other" content-divergent changeset '11f849d7159f' |
|
74 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
72 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
75 working directory is now at 171614c9a791 |
73 working directory is now at 171614c9a791 |
76 |
74 |
77 $ hg glog |
75 $ hg glog |
78 @ 8:171614c9a791 added b |
76 @ 8:171614c9a791 added b |
165 $ hg evolve --content-divergent |
163 $ hg evolve --content-divergent |
166 merge:[13] added x |
164 merge:[13] added x |
167 with: [12] added foo to x |
165 with: [12] added foo to x |
168 base: [11] added x |
166 base: [11] added x |
169 rebasing "other" content-divergent changeset 1e1a50385a7d on 4ae4427ee9f8 |
167 rebasing "other" content-divergent changeset 1e1a50385a7d on 4ae4427ee9f8 |
170 updating to "local" side of the conflict: 1e4f6b3bb39b |
|
171 merging "other" content-divergent changeset '80cc9b1ec650' |
|
172 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
168 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
173 working directory is now at b006cf317e0e |
169 working directory is now at b006cf317e0e |
174 |
170 |
175 $ hg exp |
171 $ hg exp |
176 # HG changeset patch |
172 # HG changeset patch |
254 $ hg evolve --content-divergent |
250 $ hg evolve --content-divergent |
255 merge:[19] added y |
251 merge:[19] added y |
256 with: [17] added y |
252 with: [17] added y |
257 base: [16] added y |
253 base: [16] added y |
258 rebasing "other" content-divergent changeset 2a9f6ccbdeba on b006cf317e0e |
254 rebasing "other" content-divergent changeset 2a9f6ccbdeba on b006cf317e0e |
259 updating to "local" side of the conflict: b4575ed6fcfc |
|
260 merging "other" content-divergent changeset '48f745db3f53' |
|
261 merging y |
255 merging y |
262 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
256 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
263 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
257 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
264 fix conflicts and see `hg help evolve.interrupted` |
258 fix conflicts and see `hg help evolve.interrupted` |
265 [1] |
259 [1] |
419 (no more unresolved files) |
413 (no more unresolved files) |
420 continue: hg evolve --continue |
414 continue: hg evolve --continue |
421 |
415 |
422 $ hg evolve --continue |
416 $ hg evolve --continue |
423 evolving 23:3f7a1f693080 "added z" |
417 evolving 23:3f7a1f693080 "added z" |
424 updating to "local" side of the conflict: 53242575ffa9 |
|
425 merging "other" content-divergent changeset 'cdb0643c69fc' |
|
426 merging y |
418 merging y |
427 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
419 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
428 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
420 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
429 fix conflicts and see `hg help evolve.interrupted` |
421 fix conflicts and see `hg help evolve.interrupted` |
430 [1] |
422 [1] |