[Bug 5837] New: Rebasing a copy onto a source-file edit loses the edit

[mercurial-bugs at mercurial-scm.org]

https://bz.mercurial-scm.org/show_bug.cgi?id=5837

            Bug ID: 5837
           Summary: Rebasing a copy onto a source-file edit loses the edit
           Product: Mercurial
           Version: unspecified
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: rebase
          Assignee: bugzilla at mercurial-scm.org
          Reporter: dploch at google.com
                CC: mercurial-devel at mercurial-scm.org

This bug feels similar but not identical to 5436.

Given the following commit graph:

A--B
 \
  -C

Where 'B' is an edit of 'file1', and 'C' is a copy of file1 -> file2, rebase C
onto B producing C'.

A--B--C'

Expected result:
  Edits to file1 are propagated to file2, with possible merge step.

Actual result:
  Edits to file1 are ignored, but the copy information is preserved.  'hg diff'
from B -> C' show C' as explicitly undoing the edits of commit B.

-- 
You are receiving this mail because:
You are on the CC list for the bug.