D7183: py3: render message about conflicts in chistedit code

martinvonz added a comment. In D7183#105654 , @martinvonz wrote: > In D7183#105653 , @yuja wrote: > >>> if len(conflicts) > 0: >>> >>> - conflictstr = b','.join(map(lambda r: str(r.ctx),

D7183: py3: render message about conflicts in chistedit code

martinvonz added a comment. In D7183#105653 , @yuja wrote: >> if len(conflicts) > 0: >> >> - conflictstr = b','.join(map(lambda r: str(r.ctx), conflicts)) >> >> +conflictstr = b','.join(map(lambda r: r.ctx.hex(),

D7183: py3: render message about conflicts in chistedit code

yuja added a comment. > if len(conflicts) > 0: > > - conflictstr = b','.join(map(lambda r: str(r.ctx), conflicts)) > > +conflictstr = b','.join(map(lambda r: r.ctx.hex(), conflicts)) Seems okay, but it was previously a short hash. REPOSITORY rHG Mercurial CHANGES

Re: D7183: py3: render message about conflicts in chistedit code

> if len(conflicts) > 0: > -conflictstr = b','.join(map(lambda r: str(r.ctx), conflicts)) > +conflictstr = b','.join(map(lambda r: r.ctx.hex(), conflicts)) Seems okay, but it was previously a short hash. ___

D7183: py3: render message about conflicts in chistedit code

Closed by commit rHG9acc86e812b8: py3: render message about conflicts in chistedit code (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7183?vs=17438=17459

D7183: py3: render message about conflicts in chistedit code

martinvonz updated this revision to Diff 17438. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7183?vs=17430=17438 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7183/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7183 AFFECTED

D7183: py3: render message about conflicts in chistedit code

martinvonz updated this revision to Diff 17430. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7183?vs=17422=17430 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7183/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7183 AFFECTED

D7183: py3: render message about conflicts in chistedit code

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Now you can also reorder commits that (potentially) conflict. Just don't try to confirm the changes yet (because then it