[issue1932] backward merge doesn't follow renames

Wagner Bruna bugs at mercurial.selenic.com
Tue Dec 1 10:29:37 CST 2009


New submission from Wagner Bruna <wagner.bruna+mercurial at gmail.com>:

hg init t
cd t
echo a > a
hg ci -Am a
hg mv a b
hg ci -m "a -> b"
echo "b" > b
hg ci -m b
  
hg up -C 1
hg revert --all --no-backup -r 2
hg up 0

I'd expect to get "b" inside file a; instead, the file b shows as deleted:
" local changed b which remote deleted
use (c)hanged version or (d)elete?"

----------
messages: 11134
nosy: wbruna
priority: bug
status: unread
title: backward merge doesn't follow renames

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


More information about the Mercurial-devel mailing list