[PATCH] merge: avoid to break the dirstate copy status on moved files
Benoit Boissinot
bboissin at gmail.com
Wed May 5 15:52:59 CDT 2010
On Wed, May 05, 2010 at 10:04:55PM +0200, Gilles Moris wrote:
> On Wednesday 05 May 2010 12:48:50 am Benoit Boissinot wrote:
>
> But the backward merge still has the problem:
>
> hg init repo
> cd repo
> echo a > file
> hg ci -Am a
> hg mv file renamed
> hg ci -m r
> echo b >> renamed
> hg up 0
> local changed renamed which remote deleted
> use (c)hanged version or (d)elete?
>
> I guess that copies has not been implemented to handle backward merge, and I
> don't know it can be modified. The problem here is if you choose delete: this
> will simply blow out your local changes for this file, so loss of
> information.
> Shall I enter an issue in the tracker for that one ?
Please do. And add me to the nosy list.
cheers,
Benoit
--
:wq
More information about the Mercurial-devel
mailing list