D6613: commit: improve the files field of changelog for merges (RFC)

JordiGH (Jordi GutiƩrrez Hermoso) phabricator at mercurial-scm.org
Wed Jul 10 19:33:51 EDT 2019


JordiGH added inline comments.

INLINE COMMENTS

> localrepo.py:2658
>                      del m[f]
> +                if p2.rev() != nullrev:
> +                    @util.cachefunc

Not all merges can be detected by checking for p2 being non-null; p1 being null but p2 being non-null is perfectly acceptable everywhere else, although normally hg won't produce commits like this in most circumstances.

REPOSITORY
  rHG Mercurial

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

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

To: valentin.gatienbaron, #hg-reviewers, mharbison72
Cc: JordiGH, yuja, mharbison72, martinvonz, mjpieters, mercurial-devel


More information about the Mercurial-devel mailing list