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

JordiGH (Jordi GutiƩrrez Hermoso) phabricator at mercurial-scm.org
Thu Jul 11 08:51:28 EDT 2019


JordiGH added inline comments.

INLINE COMMENTS

> valentin.gatienbaron wrote in localrepo.py:2658
> It'd be trivial to change the code to check both parents, but I find what you say surprising. Aren't there plenty of places in hg that do checks similar to this one:
> 
> https://www.mercurial-scm.org/repo/hg-committed/file/3bc400ccbf99/mercurial/context.py#l443
> https://www.mercurial-scm.org/repo/hg-committed/file/3bc400ccbf99/mercurial/context.py#l2414
> https://www.mercurial-scm.org/repo/hg-committed/file/3bc400ccbf99/mercurial/localrepo.py#l2407

Hm, yes, you're right. I suppose it's a coincidence that a lot of things still work if p1 is null but p2 isn't. It's certainly not something that hg verify nor hg log complains about.

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