[PATCH 3 of 3 STABLE] revert: look for copies information for all local modifications

Martin von Zweigbergk martinvonz at google.com
Thu Nov 27 00:50:15 UTC 2014


On Wed Nov 26 2014 at 4:44:00 PM Pierre-Yves David <
pierre-yves.david at ens-lyon.org> wrote:

>
>
> On 11/26/2014 04:38 PM, Martin von Zweigbergk wrote:
> >
> > On Wed Nov 26 2014 at 4:33:16 PM Pierre-Yves David
> > <pierre-yves.david at ens-lyon.org <mailto:pierre-yves.david at ens-lyon.org>>
> > wrote:
> >
> >
> >
> >     On 11/26/2014 04:29 PM, Martin von Zweigbergk wrote:
> >      >
> >      > On Wed Nov 26 2014 at 3:31:37 PM Pierre-Yves David
> >      > <pierre-yves.david at ens-lyon.__org
> >     <mailto:pierre-yves.david at ens-lyon.org>
> >     <mailto:pierre-yves.david at ens-__lyon.org
> >     <mailto:pierre-yves.david at ens-lyon.org>>>
> >      > wrote:
> >      >
> >      >     +Also true for move overwriting existing file
> >      >     +
> >      >     +  $ hg mv --force a b/b
> >      >     +  $ hg revert b/b
> >      >     +  $ hg status a b/b
> >      >     +
> >      >
> >      >
> >      > Could you remind me what the output would have been before this
> >     patch?
> >
> >
> >     B would not have been removed.
> >
> >
> > It is still not removed... which makes sense, but it's no difference.
>
> What I wanted to write is:
>
> Before this patch, a (the source of the rename) is left removed. After
> this patch it is properly restored when 'b/b' (the destination of the
> rename) is reverted.
>
>
Interesting. I would not expect a to be restored since the user explicitly
asked to restore b/b. Did you? The patch is not tagged with issue4458, so I
assume it's not needed for mq.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20141127/ec4ca200/attachment-0002.html>


More information about the Mercurial-devel mailing list