576 hg._showstats(repo, stats) |
576 hg._showstats(repo, stats) |
577 |
577 |
578 # conflicts while merging content-divergent changesets |
578 # conflicts while merging content-divergent changesets |
579 if compat.hasconflict(stats): |
579 if compat.hasconflict(stats): |
580 evolvestate.save() |
580 evolvestate.save() |
581 raise error.InterventionRequired(_("fix conflicts and see `hg help " |
581 hint = _("see 'hg help evolve.interrupted'") |
582 "evolve.interrupted`")) |
582 raise error.InterventionRequired(_("unresolved merge conflicts"), |
|
583 hint=hint) |
583 |
584 |
584 def _completecontentdivergent(ui, repo, progresscb, divergent, other, |
585 def _completecontentdivergent(ui, repo, progresscb, divergent, other, |
585 base, evolvestate): |
586 base, evolvestate): |
586 """completes the content-divergence resolution""" |
587 """completes the content-divergence resolution""" |
587 # no conflicts were there in merging content divergent changesets, let's |
588 # no conflicts were there in merging content divergent changesets, let's |
982 repo.dirstate.write(tr) |
983 repo.dirstate.write(tr) |
983 # fix up dirstate for copies and renames |
984 # fix up dirstate for copies and renames |
984 copies.duplicatecopies(repo, repo[None], dest.rev(), |
985 copies.duplicatecopies(repo, repo[None], dest.rev(), |
985 orig.p1().rev()) |
986 orig.p1().rev()) |
986 dirstatedance(repo, dest, orig.node(), None) |
987 dirstatedance(repo, dest, orig.node(), None) |
987 raise error.InterventionRequired(_("fix conflicts and see `hg help " |
988 hint = _("see 'hg help evolve.interrupted'") |
988 "evolve.interrupted`")) |
989 raise error.InterventionRequired(_("unresolved merge conflicts"), |
|
990 hint=hint) |
989 nodenew = _relocatecommit(repo, orig, commitmsg) |
991 nodenew = _relocatecommit(repo, orig, commitmsg) |
990 _finalizerelocate(repo, orig, dest, nodenew, tr, category, evolvestate) |
992 _finalizerelocate(repo, orig, dest, nodenew, tr, category, evolvestate) |
991 return nodenew |
993 return nodenew |
992 |
994 |
993 def _relocatecommit(repo, orig, commitmsg): |
995 def _relocatecommit(repo, orig, commitmsg): |
1591 `hg merge`). This can lead to an "interrupted state" where human assistance is |
1593 `hg merge`). This can lead to an "interrupted state" where human assistance is |
1592 requested. There are three things which you can do when you face a similar |
1594 requested. There are three things which you can do when you face a similar |
1593 situation: |
1595 situation: |
1594 |
1596 |
1595 - `hg evolve --continue`: |
1597 - `hg evolve --continue`: |
1596 fix all the conflicts using `hg resolve` and then run this to continue the |
1598 resolve all the conflicts using `hg resolve` and then run this to |
1597 interrupted evolve |
1599 continue the interrupted evolve |
1598 |
1600 |
1599 - `hg evolve --stop`: |
1601 - `hg evolve --stop`: |
1600 stops the current interrupted evolve, keeping all the successful steps, |
1602 stops the current interrupted evolve, keeping all the successful steps, |
1601 but delaying to resolution of the remaining step for later. |
1603 but delaying to resolution of the remaining step for later. |
1602 |
1604 |