equal
deleted
inserted
replaced
137 |
137 |
138 $ hg evolve --all --any --content-divergent |
138 $ hg evolve --all --any --content-divergent |
139 merge:[2] divergent |
139 merge:[2] divergent |
140 with: [3] divergent |
140 with: [3] divergent |
141 base: [1] added b |
141 base: [1] added b |
142 updating to "local" side of the conflict: 593c57f2117e |
|
143 merging "other" content-divergent changeset '8374d2ddc3a4' |
|
144 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
142 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
145 working directory is now at 45bf1312f454 |
143 working directory is now at 45bf1312f454 |
146 $ hg log -G |
144 $ hg log -G |
147 @ 4:45bf1312f454@default(draft) divergent [] |
145 @ 4:45bf1312f454@default(draft) divergent [] |
148 | |
146 | |
235 > c |
233 > c |
236 > EOF |
234 > EOF |
237 merge:[6] added d |
235 merge:[6] added d |
238 with: [5] added d |
236 with: [5] added d |
239 base: [4] added d |
237 base: [4] added d |
240 merging "other" content-divergent changeset '9e5dffcb3d48' |
|
241 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
238 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
242 content divergent changesets on different branches. |
239 content divergent changesets on different branches. |
243 choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c |
240 choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c |
244 working directory is now at 0ac42f1bc15c |
241 working directory is now at 0ac42f1bc15c |
245 |
242 |
290 |
287 |
291 $ hg evolve --content-divergent --no-all |
288 $ hg evolve --content-divergent --no-all |
292 merge:[9] added a d with bar in it, expect some beers |
289 merge:[9] added a d with bar in it, expect some beers |
293 with: [8] added d |
290 with: [8] added d |
294 base: [7] added d |
291 base: [7] added d |
295 merging "other" content-divergent changeset 'f621d00f5f0e' |
|
296 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
292 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
297 working directory is now at a9d6fd6b5e40 |
293 working directory is now at a9d6fd6b5e40 |
298 |
294 |
299 $ hg glog |
295 $ hg glog |
300 @ 10:a9d6fd6b5e40 added a d with bar in it, expect some beers |
296 @ 10:a9d6fd6b5e40 added a d with bar in it, expect some beers |
339 |
335 |
340 $ hg evolve --content-divergent --no-all |
336 $ hg evolve --content-divergent --no-all |
341 merge:[12] foo to d |
337 merge:[12] foo to d |
342 with: [11] foo to d |
338 with: [11] foo to d |
343 base: [10] added a d with bar in it, expect some beers |
339 base: [10] added a d with bar in it, expect some beers |
344 merging "other" content-divergent changeset 'b10b07a394f1' |
|
345 merging d |
340 merging d |
346 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
341 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
347 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
342 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
348 fix conflicts and see `hg help evolve.interrupted` |
343 fix conflicts and see `hg help evolve.interrupted` |
349 [1] |
344 [1] |
399 |
394 |
400 $ hg evolve --content-divergent --no-all |
395 $ hg evolve --content-divergent --no-all |
401 merge:[15] wat to d, wat? |
396 merge:[15] wat to d, wat? |
402 with: [14] bar to d, expect beers |
397 with: [14] bar to d, expect beers |
403 base: [13] foo to d |
398 base: [13] foo to d |
404 merging "other" content-divergent changeset '27f0463f169a' |
|
405 merging d |
399 merging d |
406 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
400 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
407 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
401 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
408 fix conflicts and see `hg help evolve.interrupted` |
402 fix conflicts and see `hg help evolve.interrupted` |
409 [1] |
403 [1] |
610 hg commit -m "`hg log -r 13c1b75640a1 --template={desc}`"; |
604 hg commit -m "`hg log -r 13c1b75640a1 --template={desc}`"; |
611 $ hg evolve --content-divergent --no-all |
605 $ hg evolve --content-divergent --no-all |
612 merge:[6] More addition (2) |
606 merge:[6] More addition (2) |
613 with: [4] More addition |
607 with: [4] More addition |
614 base: [1] More addition |
608 base: [1] More addition |
615 merging "other" content-divergent changeset '5bf84d1d71d1' |
|
616 merging a |
609 merging a |
617 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
610 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
618 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
611 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
619 fix conflicts and see `hg help evolve.interrupted` |
612 fix conflicts and see `hg help evolve.interrupted` |
620 [1] |
613 [1] |
958 |
951 |
959 $ hg evolve --content-divergent --rev 'desc("E3")' |
952 $ hg evolve --content-divergent --rev 'desc("E3")' |
960 merge:[2] E2 |
953 merge:[2] E2 |
961 with: [3] E3 |
954 with: [3] E3 |
962 base: [1] E1 |
955 base: [1] E1 |
963 updating to "local" side of the conflict: 084ae625fa51 |
|
964 merging "other" content-divergent changeset '19ed1bf64a2c' |
|
965 merging numbers |
956 merging numbers |
966 merging romans |
957 merging romans |
967 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
958 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
968 working directory is now at aae293050980 |
959 working directory is now at aae293050980 |
969 $ hg status |
960 $ hg status |