when merged more files are listed as changed

[Prabhakar S]

Thank you for the details.

When I checked that, yes according to the information above, when i run a
diff between the tip revision and the first parten it shows lot files in
the diffstat.

What Iam not able to understand is, when I run 'hg diff -c <first_parent> ,
then only one file shows up, however when the diff is run between the tip
and the first_parent lot of files are shown up.

I understand that , if say 10 files are modified in a changeset_A and if it
is merged to a release repo, and if no conflicts also, all those 10 files
are going to be shown as modified.

It would be great, if you give some good pointers to understand how this is
handled.

Regards,
S.Prabhakar



On Wed, Jun 3, 2015 at 11:08 PM, Matt Mackall <mpm at selenic.com> wrote:

> On Wed, 2015-06-03 at 18:44 +0530, Prabhakar S wrote:
> > Greetings,
> >
> > We have a scenario where for two releases we are having two repos and
> > sometimes when the two repos are merged, say repo_REL1 is merged to
> > repo_REL2 and for some conflicts with two or three files .
> >
> > Once they are resolved and pushed, the notification email from hg shows ,
> > more number of files as changed than expected.
> >
> > When i checked that , looks like it is generated using command below
> >
> > hg diff -r <tip> -r <priortotip_notsure_ifitisexact prior_to_tip> |
> diffstat
>
> By default, it's going to show the difference between a commit and its
> first parent.
>
> > Now the question is
> >
> > 1. Is the hg notification using the above approach to send the list of
> > modified files ?
>
> Roughly.
>
> > 2. Why is it showing more files as modified though only few files are
> > modified ?
>
> If, for instance, you merge your development branch into your release
> branch with no conflicts.. the diff is still going to show _all your
> development_ because all those files have changed.
>
> --
> Mathematics is the supreme nostalgia of our time.
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20150604/aadd1d2e/attachment-0002.html>