Show More
@@ -2996,7 +2996,7 b' class localrepository(object):' | |||||
2996 |
|
2996 | |||
2997 | # internal config: ui.allowemptycommit |
|
2997 | # internal config: ui.allowemptycommit | |
2998 | allowemptycommit = ( |
|
2998 | allowemptycommit = ( | |
2999 |
|
|
2999 | cctx.branch() != cctx.p1().branch() | |
3000 | or extra.get(b'close') |
|
3000 | or extra.get(b'close') | |
3001 | or merge |
|
3001 | or merge | |
3002 | or cctx.files() |
|
3002 | or cctx.files() |
@@ -129,7 +129,16 b' Merge and its ancestors all become empty' | |||||
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) | |
@@ -137,6 +146,7 b' Merge and its ancestors all become empty' | |||||
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 |
General Comments 0
You need to be logged in to leave comments.
Login now