D774: merge: add pathconflict merge state

mbthomas (Mark Thomas) phabricator at mercurial-scm.org
Thu Oct 5 10:45:02 EDT 2017


mbthomas added inline comments.

INLINE COMMENTS

> ryanmce wrote in merge.py:364-365
> Even though there's not a lot of good comments here, now, could you add some when you modify this?
> 
> Something like "if the state includes a path conflict (pu or pr), include a Path (P) record which ...." (I don't know what to write here -- why don't we need to distinguish between pu and pr in the record? A reader should not have to figure this out on their own, ideally.

This could use some improvement in general, so I'll write some comments on how this function works as a follow-up patch.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D774

To: mbthomas, #hg-reviewers, ryanmce
Cc: kiilerix, ryanmce, mercurial-devel


More information about the Mercurial-devel mailing list