D6408: convert: demonstrate broken {files} list in merge commits with file flags

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Thu May 23 09:06:01 EDT 2019


martinvonz marked an inline comment as done.
martinvonz added inline comments.

INLINE COMMENTS

> pulkit wrote in test-convert-hg-sink.t:604
> Oh, I understood the merge commit other way. So this should show `a` or not? I am not sure whether we consider mod change as file change or not.

A file gets included pretty if it's different from both parents, so `a` should not be included here.

REPOSITORY
  rHG Mercurial

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

To: martinvonz, #hg-reviewers
Cc: pulkit, mercurial-devel


More information about the Mercurial-devel mailing list