[Updated] D8713: error: normalize "unresolved conflicts" error messages with a custom class

dploch (Daniel Ploch) phabricator at mercurial-scm.org
Tue Jul 14 20:42:39 UTC 2020


dploch added inline comments.

INLINE COMMENTS

> pulkit wrote in rebase.py:23
> unrelated change

Removed.  Seems like this is a difference between black 19.3b and 19.10b

> pulkit wrote in error.py:118
> Seems like this `if` is not required anymore after D8730 <https://phab.mercurial-scm.org/D8730>.

Fixed - I had made the change earlier but due to a bug in Phabricator the upload failed.  Martinvonz fixed it so this should be up to date now.

> pulkit wrote in shelve.py:56
> unrelated change

Removed.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8713/new/

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

To: dploch, durin42, martinvonz, #hg-reviewers
Cc: pulkit, mjacob, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200714/f629a4c6/attachment-0002.html>


More information about the Mercurial-patches mailing list