[issue3046] Rebase with 'detach', 'resolve' and 'continue' detaches from wrong parent

Ruslan Yushchenko bugs at mercurial.selenic.com
Fri Oct 14 03:28:08 CDT 2011


New submission from Ruslan Yushchenko <yruslan at gmail.com>:

Let's consider following repository (attached as "original")

A1-A2-A3-A4
  \---------B2-B3-B4

1. Rebase in one step:
#hg rebase -s B4 -d A4 --detach

A1-A2-A3-A4----------B4
  \------------B2-B3

(which is correct).

2. Rebase with resolve and 
#hg rebase -s B4 -d A4 --detach --config ui.merge=internal:fail
#hg resolve --all
#hg rebase --continue

A1-A2-A3-A4
  \---------B2-B3-B4-B4~

This is wrong. Commit messages for both B4 and B4~ are equal, but diffs are
different.

I presume, the merge completed right, but was detached from wrong parent.

----------
files: Test_Repos.zip
messages: 17635
nosy: yruslan
priority: bug
status: unread
title: Rebase with 'detach', 'resolve' and  'continue' detaches from wrong parent
topic: 1.9

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue3046>
____________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Test_Repos.zip
Type: application/x-zip-compressed
Size: 22799 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20111014/bf729544/attachment.bin>


More information about the Mercurial-devel mailing list