[issue2171] backward merge fails to follow renamed files

[Gilles Moris]

New submission from Gilles Moris <gilles.moris at free.fr>:

When updating backward in history with local modifications, mercurial fails
to follow renamed files. Applies to HG 1.5.2:

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.py has not been implemented to handle backward merge.
The problem here is if you choose delete: this will simply blow out your
local changes for this file, so loss of information.

----------
messages: 12443
nosy: morisgi, tonfa
priority: bug
status: unread
title: backward merge fails to follow renamed files
topic: merge

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2171>
____________________________________________________