[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mercurial-devel
Subject:    [issue850] Directory rename inference may lead to unexpected merge
From:       Peter Arrenbrecht <mercurial-bugs () selenic ! com>
Date:       2007-11-30 14:37:30
Message-ID: 1196433450.14.0.191609601482.issue850 () selenic ! com
[Download RAW message or body]


New submission from Peter Arrenbrecht <peter.arrenbrecht@gmail.com>:

When moving the sole file within a folder "a" to a new folder "b", hg infers
folder "a" was renamed to "b". But that was not the intention. A subsequent
merge of a new file in "a" moves the new file to "b".

#! /bin/bash
#rm repo -rf # -- uncomment to make repeatable
hg init repo
cd repo
hg init one
cd one
mkdir a
echo "one" >a/one
hg add
hg ci -m "one"
cd ..
hg clone one two
cd two
echo "two" >a/two
hg add
hg ci -m "two"
cd ..
cd one
mkdir b
hg mv a/one b/one
hg ci -m "a2b"
hg pull -u ../two
hg merge
echo "a contains"
ls a
echo "b contains"
ls b

----------
messages: 4394
nosy: parren
priority: wish
status: chatting
title: Directory rename inference may lead to unexpected merge result
topic: merge

____________________________________________________
Mercurial issue tracker <mercurial-bugs@selenic.com>
<http://www.selenic.com/mercurial/bts/issue850>
____________________________________________________

_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@selenic.com
http://selenic.com/mailman/listinfo/mercurial-devel
[prev in list] [next in list] [prev in thread] [next in thread]