equal
deleted
inserted
replaced
346 |
346 |
347 # - plain prune (no successor) changesets are rebased |
347 # - plain prune (no successor) changesets are rebased |
348 # - split changesets are not rebased if at least one of the |
348 # - split changesets are not rebased if at least one of the |
349 # changeset resulting from the split is an ancestor of dest |
349 # changeset resulting from the split is an ancestor of dest |
350 rebaseset = rebasesetrevs - set(obsoletenotrebased) |
350 rebaseset = rebasesetrevs - set(obsoletenotrebased) |
|
351 if rebasesetrevs and not rebaseset: |
|
352 msg = _('all requested changesets have equivalents ' |
|
353 'or were marked as obsolete') |
|
354 hint = _('to force the rebase, set the config ' |
|
355 'experimental.rebaseskipobsolete to False') |
|
356 raise error.Abort(msg, hint=hint) |
|
357 |
351 result = buildstate(repo, dest, rebaseset, collapsef, |
358 result = buildstate(repo, dest, rebaseset, collapsef, |
352 obsoletenotrebased) |
359 obsoletenotrebased) |
353 |
360 |
354 if not result: |
361 if not result: |
355 # Empty state built, nothing to rebase |
362 # Empty state built, nothing to rebase |