Show More
@@ -184,7 +184,8 b' def rebase(ui, repo, **opts):' | |||||
184 | rebaseset = repo.revs( |
|
184 | rebaseset = repo.revs( | |
185 | '(children(ancestor(%ld, %d)) and ::(%ld))::', |
|
185 | '(children(ancestor(%ld, %d)) and ::(%ld))::', | |
186 | base, dest, base) |
|
186 | base, dest, base) | |
187 |
|
187 | # temporary top level filtering of extinct revisions | ||
|
188 | rebaseset = repo.revs('%ld - hidden()', rebaseset) | |||
188 | if rebaseset: |
|
189 | if rebaseset: | |
189 | root = min(rebaseset) |
|
190 | root = min(rebaseset) | |
190 | else: |
|
191 | else: | |
@@ -193,7 +194,7 b' def rebase(ui, repo, **opts):' | |||||
193 | if not rebaseset: |
|
194 | if not rebaseset: | |
194 | repo.ui.debug('base is ancestor of destination\n') |
|
195 | repo.ui.debug('base is ancestor of destination\n') | |
195 | result = None |
|
196 | result = None | |
196 | elif not keepf and repo.revs('first(children(%ld) - %ld)', |
|
197 | elif not keepf and repo.revs('first(children(%ld) - %ld)-hidden()', | |
197 | rebaseset, rebaseset): |
|
198 | rebaseset, rebaseset): | |
198 | raise util.Abort( |
|
199 | raise util.Abort( | |
199 | _("can't remove original changesets with" |
|
200 | _("can't remove original changesets with" |
@@ -222,3 +222,61 b' collapse rebase' | |||||
222 |
|
222 | |||
223 | $ cd .. |
|
223 | $ cd .. | |
224 |
|
224 | |||
|
225 | Rebase set has hidden descendants | |||
|
226 | --------------------------------- | |||
|
227 | ||||
|
228 | We rebase a changeset which has a hidden changeset. The hidden changeset must | |||
|
229 | not be rebased. | |||
|
230 | ||||
|
231 | $ hg clone base hidden | |||
|
232 | updating to branch default | |||
|
233 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
234 | $ cd hidden | |||
|
235 | $ hg rebase -s 5fddd98957c8 -d eea13746799a | |||
|
236 | $ hg rebase -s 42ccdea3bb16 -d 02de42196ebe | |||
|
237 | $ hg log -G | |||
|
238 | @ 10:7c6027df6a99 B | |||
|
239 | | | |||
|
240 | | o 9:cf44d2f5a9f4 D | |||
|
241 | | | | |||
|
242 | | o 8:e273c5e7d2d2 C | |||
|
243 | | | | |||
|
244 | o | 7:02de42196ebe H | |||
|
245 | | | | |||
|
246 | | o 6:eea13746799a G | |||
|
247 | |/| | |||
|
248 | o | 5:24b6387c8c8c F | |||
|
249 | | | | |||
|
250 | | o 4:9520eea781bc E | |||
|
251 | |/ | |||
|
252 | o 0:cd010b8cd998 A | |||
|
253 | ||||
|
254 | $ hg log --hidden -G | |||
|
255 | @ 10:7c6027df6a99 B | |||
|
256 | | | |||
|
257 | | o 9:cf44d2f5a9f4 D | |||
|
258 | | | | |||
|
259 | | o 8:e273c5e7d2d2 C | |||
|
260 | | | | |||
|
261 | o | 7:02de42196ebe H | |||
|
262 | | | | |||
|
263 | | o 6:eea13746799a G | |||
|
264 | |/| | |||
|
265 | o | 5:24b6387c8c8c F | |||
|
266 | | | | |||
|
267 | | o 4:9520eea781bc E | |||
|
268 | |/ | |||
|
269 | | x 3:32af7686d403 D | |||
|
270 | | | | |||
|
271 | | x 2:5fddd98957c8 C | |||
|
272 | | | | |||
|
273 | | x 1:42ccdea3bb16 B | |||
|
274 | |/ | |||
|
275 | o 0:cd010b8cd998 A | |||
|
276 | ||||
|
277 | $ hg debugobsolete | |||
|
278 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b e273c5e7d2d29df783dce9f9eaa3ac4adc69c15d 0 {'date': '*', 'user': 'test'} (glob) | |||
|
279 | 32af7686d403cf45b5d95f2d70cebea587ac806a cf44d2f5a9f4297a62be94cbdd3dff7c7dc54258 0 {'date': '*', 'user': 'test'} (glob) | |||
|
280 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 7c6027df6a99d93f461868e5433f63bde20b6dfb 0 {'date': '*', 'user': 'test'} (glob) | |||
|
281 | ||||
|
282 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now