127 > C |
127 > C |
128 > | |
128 > | |
129 > B |
129 > B |
130 > EOS |
130 > EOS |
131 |
131 |
132 $ hg rebase -r '(A::)-(B::)-A' -d H |
132 Previously, there was a bug where the empty commit check compared the parent |
|
133 branch name with the wdir branch name instead of the actual branch name (which |
|
134 should stay unchanged if --keepbranches is passed), and erroneously assumed |
|
135 that an otherwise empty changeset should be created because of the incorrectly |
|
136 assumed branch name change. |
|
137 |
|
138 $ hg update H -q |
|
139 $ hg branch foo -q |
|
140 |
|
141 $ hg rebase -r '(A::)-(B::)-A' -d H --keepbranches |
133 rebasing 2:dc0947a82db8 "C" (BOOK-C) |
142 rebasing 2:dc0947a82db8 "C" (BOOK-C) |
134 note: not rebasing 2:dc0947a82db8 "C" (BOOK-C), its destination already has all its changes |
143 note: not rebasing 2:dc0947a82db8 "C" (BOOK-C), its destination already has all its changes |
135 rebasing 3:b18e25de2cf5 "D" (BOOK-D) |
144 rebasing 3:b18e25de2cf5 "D" (BOOK-D) |
136 note: not rebasing 3:b18e25de2cf5 "D" (BOOK-D), its destination already has all its changes |
145 note: not rebasing 3:b18e25de2cf5 "D" (BOOK-D), its destination already has all its changes |
137 rebasing 4:86a1f6686812 "E" (BOOK-E E) |
146 rebasing 4:86a1f6686812 "E" (BOOK-E E) |
138 note: not rebasing 4:86a1f6686812 "E" (BOOK-E E), its destination already has all its changes |
147 note: not rebasing 4:86a1f6686812 "E" (BOOK-E E), its destination already has all its changes |
139 saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg |
148 saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg |
|
149 $ hg update null -q |
140 |
150 |
141 $ hg log -G -T '{rev} {desc} {bookmarks}' |
151 $ hg log -G -T '{rev} {desc} {bookmarks}' |
142 o 4 H BOOK-C BOOK-D BOOK-E |
152 o 4 H BOOK-C BOOK-D BOOK-E |
143 | |
153 | |
144 o 3 D |
154 o 3 D |