[Bug 5197] New: rebase created a git-style merge

[mercurial-bugs at selenic.com]

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

            Bug ID: 5197
           Summary: rebase created a git-style merge
           Product: Mercurial
           Version: default branch
          Hardware: PC
                OS: Windows
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: rebase
          Assignee: bugzilla at selenic.com
          Reporter: timeless at gmail.com
                CC: mercurial-devel at selenic.com

At the time of my rebase, 31667 had only one series of descendants leading to
31786, but including the merge 31770.

2016/04/11 19:13:17 timeless @a31faa48eba1cfdb4fb445e7b6c5cf6ebfba18b3 (88988)
[command]> rebase -s 31667 -d @committed

followed by a few resolves (mostly for check-py3-compat) resulted in:

@  31803
|
o  31802
|
o  31801
|
o  31800
|
o  31799
|
o  31798
|
o  31797
|
o  31796
|
o  31795
|
o  31794
|
o  31793
|
o  31792
|
o  31791
|
o  31790
|
o  31789
|
o  31788
|
o    31787
|\
| | x  31786
| | |
| | x  31785
| | |
| | x  31784
| | |
| | x  31783
| | |
| | x  31782
| | |
| | x  31781
| | |
| | x  31780
| | |
| | x  31779
| | |
| | x  31778
| | |
| | x  31777
| | |
| | x  31776
| | |
| | x  31775
| | |
| | x  31774
| | |
| | x  31773
| | |
| | x  31772
| | |
| | x  31771
| | |
| | x  31770
| |/|
| o |  31769
| | |
| o |  31768
| | |
| o |  31767
| | |
| o |  31766
| | |
| o |  31765
| | |
| o |  31764
| | |
| o |  31763
|/ /
| | x  31762
| | |
| | x  31761
| | |
| | x  31760
| | |
| | x  31759
| | |
| | x  31758
| | |
| | x  31757
| | |
| | x  31756
| | |
| | x  31755
| | |
| | x  31754
| | |
| | x  31753
| | |
| | x  31752
| | |
| | x  31751
| | |
| | x  31750
| | |
| | x  31749
| | |
| | x  31748
| | |
| | | x  31747
| | | |
| | | x  31746
| | | |
| | | x  31745
| | | |
| | | x  31744
| | | |
| | | x  31743
| | | |
| | | x  31742
| | | |
| | | x  31741
| | | |
| | | x  31740
| | | |
| | | x  31739
| | | |
| | | x  31738
| | | |
| | | | x  31737
| | | | |
| | | | x  31736
| | | |/
| | | x  31735
| | |/
| | | x  31734
| | | |
| | | x  31733
| | |/
| | x  31732
| | |
| | | x  31731
| | | |
| | | x  31730
| | | |
| | | x  31729
| | | |
| | | x  31728
| | | |
| | | x  31727
| | | |
| | | x  31726
| | | |
| | | x  31725
| | | |
| | | x  31724
| | | |
| | | x  31723
| | | |
| | | x  31722
| | | |
| | | x  31721
| | | |
| | | x  31720
| | | |
| | | x  31719
| | | |
| | | x  31718
| | |/
o | |  31717 @committed
| | |
o | |  31716
| | |
o | |  31715
| | |
o | |  31714
| | |
o | |  31713
| | |
o | |  31712
| | |
o | |  31711
| | |
o | |  31710
| | |
o | |  31709
| | |
o | |  31708
| | |
o | |  31707
| | |
o | |  31706
| | |
o | |  31705
| | |
o | |  31704
| | |
o | |  31703
| | |
o | |  31702
| | |
o | |  31701
| | |
o | |  31700
| | |
o | |  31699
| | |
o | |  31698
| | |
o | |  31697
| | |
o | |  31696
| | |
o | |  31695
| | |
o | |  31694
| | |
| | | x  31693
| | | |
| | | x  31692
| | | |
| | | x  31691
| | | |
| | | x  31690
| | | |
| | | | x  31689
| | | | |
| | | | x  31688
| | | | |
| | | | | x  31687
| | | | | |
| | | | | x  31686
| | | | |/
| | | | x  31685
| | | |/
| | | | x  31684
| | | |/
| | | x  31683
| | | |
| | | x  31682
| | | |
| | | x  31681
| | | |
| | | x  31680
| | | |
| | | x  31679
| | | |
| | | x  31678
| | |/
| | x  31677
| |/|
| x |  31671
| | |
| x |  31670
| | |
| x |  31669
| | |
| x |  31668
| | |
| x |  31667
|/ /
| | x  31666
| | |
| | | x  31665
| | | |
| | | | x  31664
| | | |/
| | | x  31663
| | |/
+---x  31662
| |
| | x  31661
| | |
+---x  31660
| |
| | x  31659
| | |
| | | x  31658
| | |/
| | | x  31657
| | | |
| | | | x  31656
| | | |/
| | | x  31655
| | |/
+---x  31654
| |
| | x  31653
| | |
| | | x  31652
| | |/
| | | x  31651
| | | |
| | | x  31650
| | |/
+---x  31649
| |
| | x  31648
| | |
| | x  31647
| | |
+---x  31646
| |
| x  31645
| |
| x  31644
| |
| x  31643
| |
| x  31642
| |
| x  31641
| |
| x  31640
| |
| x  31639
|/
o  31606
|
o  31605
|
o  31604
|
o  31603
|
o  31602
|
o  31601
|
o  31600
|
~

(py)[timeless at gcc2-power8 crew]$ hg log --hidden -r 31770
changeset:   31770:357d2a0919d8
parent:      31769:3264ceaba824
parent:      31671:eeb488adee2f
user:        timeless <timeless at mozdev.org>
date:        Sun Apr 10 22:05:33 2016 +0000
summary:     merging: py3port

(py)[timeless at gcc2-power8 crew]$ hg log --hidden -r 31787
changeset:   31787:77a9bd556e95
parent:      31717:86db5cb55d46
parent:      31769:3264ceaba824
user:        timeless <timeless at mozdev.org>
date:        Sun Apr 10 22:05:33 2016 +0000
summary:     merging: py3port

There is content in this commit (fixup for test-check-py3-compat), but it
shouldn't have two parents.

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