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
pulkit added inline comments.
INLINE COMMENTS
> pulkit wrote in test-convert-hg-sink.t:604
> Shouldn't this show `b`?
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.
REPOSITORY
rHG Mercurial
pulkit added inline comments.
INLINE COMMENTS
> test-convert-hg-sink.t:604
> +# No files changed
> + $ hg log -r 3 -T '{files}\n'
> +
Shouldn't this show `b`?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6408
To: martinvonz, #hg-reviewers
Cc: pulkit,
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG78530404d00b: convert: demonstrate broken {files} list in
merge commits with file flags (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
When there is a merge in which the flags for a file from p2 is
non-empty, `hg convert` will incorrectly include that in the
changeset's files list.
