when merged more files are listed as changed

[Prabhakar S]

Thank you Matt for the write up. One suggestion , is if information is
included on how to reproduce to end up in a situation , where more number
of files are shown as differences though few files are changed. This will
help to reproduce this in a test repo and better understand the behaviour
and be more convinced about it.

I have to re-read your write up to get clearly understood. I shared my
thoughts on a first glimpse of it. Will re-read it for my better
understanding later.

Simply appreciate the responses.

Regards,
S.Prabhakar

On Thu, Jun 4, 2015 at 11:43 PM, Matt Mackall <mpm at selenic.com> wrote:

> On Thu, 2015-06-04 at 13:26 +0100, Simon King wrote:
> > Before the merge, r98 is the tip of branch1, and r99 is the tip of
> > branch2. r100 is the result of merging the two branches. So the diff
> > between *r98* and r100 shows the changes that have been merged into
> > branch1 from branch2. r97 is not relevant.
> >
> > r97 was relevant to the merge *operation*, because it is the common
> > ancestor of r98 and r99, but once the merge commit has been created,
> > it's not important any more.
> >
> > Simon
>
> This discussion (and a few hundred earlier ones) inspired me to write up
> this explanation that may be enlightening:
>
> https://mercurial.selenic.com/wiki/MergeDiffs
>
> --
> Mathematics is the supreme nostalgia of our time.
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20150605/9ba47c34/attachment-0002.html>