list of files in "hg log -v"
Mathieu Courtois
mathieu.courtois at gmail.com
Wed Aug 21 11:51:59 UTC 2013
I think you are right and that's the same bug.
The user didn't know 'hg mv'. He has probably done 'rm + hg add' in a
branch, and 'hg mv' in another and then rebase the first on the other.
Must I fix the repo (and how can I do that) or it's just an extra
information in the changeset and it does not matter on the consistency of
the repo ?
Thanks,
MC
2013/8/21 Simon King <simon at simonking.org.uk>
> On Wed, Aug 21, 2013 at 10:46 AM, Mathieu Courtois
> <mathieu.courtois at gmail.com> wrote:
> >
> > 2013/8/21 Pierre-Yves David <pierre-yves.david at ens-lyon.org>
> >>
> >>
> >> On 21 août 2013, at 08:38, Mathieu Courtois wrote:
> >>
> >> > Hi,
> >> >
> >> > In the output of "hg log -v -r 081615" in my repository, I can see
> that
> >> > 4 files have been changed [2].
> >> > With "-p", only one file seems changed.
> >> > The same with "hg diff -c 081615".
> >> >
> >> > If permissions have changed, it will be in the diff.
> >> > I guess a merge or rebase could does that but I can not reproduce it.
> >> >
> >> > Any idea how it can happen ?
> >>
> >> Is 081615 a merge ?
> >
> >
> > No, the history is linear:
> >
> > o 1406:2303a75db44c
> > |
> > o 1405:0816156d0dc4
> > |
> > o 1404:615cba114636
> > |
> >
> > That's why I suspect a rebase (using the internal merge mechanism) could
> > does that...
> > Have you already seen a such thing ?
> >
> > Mathieu
> >
>
> I think there have been bugs in rebase which have caused extra files
> to be mentioned in changesets:
>
> http://bz.selenic.com/show_bug.cgi?id=3739
>
> http://bz.selenic.com/show_bug.cgi?id=3833
>
> http://bz.selenic.com/show_bug.cgi?id=3509
>
> Have the files been renamed or copied at some point?
>
> Simon
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20130821/07844490/attachment-0002.html>
More information about the Mercurial
mailing list