double rename possible, warning comes later ...

rupert.thurner rupert.thurner at gmail.com
Mon Dec 12 14:36:20 UTC 2011


hi,

within many other changes, i copied a file to two other locations, and
removed the original. then i did a "hg addrem --similarity 80". it
detected a rename for both copies. no warning. then a commit, no
warning again.

then i rebased the change set, and this time a warning is printed:

$ hg rebase --source 1181 --dest 1184
note: possible conflict - lib/commits_2010_4_29.txt was renamed
multiple times to:
 lib/a/commits_2010_4_29.txt
 lib/b/commits_2010_4_29.txt

i know that a double rename is not possible and does not make sense,
but what will mercurial later on do with this changeset? does one run
into trouble with other commands later on?

rupert.



More information about the Mercurial mailing list