[Bug 4076] New: rebase is confused by merged content otherwise untouched in the rebased set

[mercurial-bugs at selenic.com]

http://bz.selenic.com/show_bug.cgi?id=4076

          Priority: normal
            Bug ID: 4076
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: rebase is confused by merged content otherwise
                    untouched in the rebased set
          Severity: bug
    Classification: Unclassified
                OS: All
          Reporter: pierre-yves.david at ens-lyon.org
          Hardware: All
            Status: UNCONFIRMED
           Version: earlier
         Component: rebase
           Product: Mercurial

Created attachment 1747
  --> http://bz.selenic.com/attachment.cgi?id=1747&action=edit
bundle of the described content

Given the following history (attached as bundle)



  o  changeset:   4:bfcb490714d6
  |  tag:         tip
  |  parent:      1:4f1fd964994c
  |  user:        Pierre-Yves David <pierre-yves.david at ens-lyon.org>
  |  date:        Wed Oct 30 20:25:55 2013 +0100
  |  summary:     Second update to main content
  |
  | @  changeset:   3:f9fe5c663ffe
  |/|  parent:      2:e05deef8ffe3
  | |  parent:      1:4f1fd964994c
  | |  user:        Pierre-Yves David <pierre-yves.david at ens-lyon.org>
  | |  date:        Wed Oct 30 20:27:24 2013 +0100
  | |  summary:     merge with first update
  | |
  | o  changeset:   2:e05deef8ffe3
  | |  parent:      0:15c6a09a9e72
  | |  user:        Pierre-Yves David <pierre-yves.david at ens-lyon.org>
  | |  date:        Wed Oct 30 20:25:22 2013 +0100
  | |  summary:     Add an unrelated file
  | |
  o |  changeset:   1:4f1fd964994c
  |/   user:        Pierre-Yves David <pierre-yves.david at ens-lyon.org>
  |    date:        Wed Oct 30 20:24:34 2013 +0100
  |    summary:     add more content in main
  |
  o  changeset:   0:15c6a09a9e72
     user:        Pierre-Yves David <pierre-yves.david at ens-lyon.org>
     date:        Wed Oct 30 20:23:24 2013 +0100
     summary:     Initial commit for main file

The command:

  rebase --source 2 --dest 4

fails on merge conflict while rebasing 3.

This happend because when rebasing 3 on 4, we merge  3 (main at 2) with 4 (main at 4)
using 2 as base (main at 1). Merging main at 2 with main at 3 conflicts from the main at 1
perspective.

We can't just use 1 as parent instead of 2 because that would create other
problem for file touched by 1.

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