[issue2708] Irrelevant "renamed multiple times" warning during update

Jesse Glick bugs at mercurial.selenic.com
Wed Mar 16 16:40:17 UTC 2011


New submission from Jesse Glick <jesse.glick at oracle.com>:

In the Mercurial source tree:

$ hg up 1.0.1
...
$ hg up 1.8.1
note: possible conflict - tests/test-http was renamed multiple times to:
 tests/test-http.t
 tests/test-https.t
note: possible conflict - tests/test-push-http was renamed multiple times to:
 tests/test-pull-http.t
 tests/test-push-http.t
853 files updated, 0 files merged, 583 files removed, 0 files unresolved

What is Mercurial trying to tell me here and why? Yes, some files were
copied at some point in history. So, what is the "conflict"?

Note that I am not even merging here; sources say something about "divergent
renames" but in merge-related code. Not sure if this message is helpful for
users during merges, but it is certainly out of place during a simple update.

----------
messages: 15692
nosy: jglick
priority: bug
status: unread
title: Irrelevant "renamed multiple times" warning during update
topic: ui, update

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


More information about the Mercurial-devel mailing list