Intland's free requirements, development and test management hosting.
This server hosts 110,000+ users on the cloud!
Trivial merge does not work on renamed file#13413/v1
Tags:  not added yet

Trivial merge does not work on renamed file[BUG-13413]

Tracker: Bugs Priority: NormalNormal Status: New
Submitted by: lorantp Dec 14, 2010 07:47 Modified by: ilya_ivanov Dec 14, 2010 07:58 Assigned to: ilya_ivanov Dec 14, 2010 07:47
Category: -- Severity: -- Resolution: --
Release: -- Detected: --
Attached is a repo with src/main/java/com/topdesk/test/hg/refactor/ being renamed to src/main/java/com/topdesk/test/hg/refactor/ The original is changed, and then we try to merge these changes into the new on the other branch.
           |                |
           |                |
        changed         renamed to
            \             /
             \           /
              \         /

This works fine from the command-line (hg 1.6.4), hg merge will merge the changes just fine.

But when I try to do the same in ME, it shows me an empty right side in the compare view (see attached screenshot). There are two exceptions in the log (see attachment ".log"). Basically both errors are about Hg not being able to find the Anything file in early revisions (because it was not renamed yet).

Comments & Attachments (2)
Associations (1)
Children (0)
References (0)
SCM Commits (0)
All (0)

Submitted Comment
Dec 14, 2010 07:47
.log 4.8 KB
Dec 14, 2010 07:47
me-merge-fail.png 98.8 KB 19.4 KB