comparison tests/test-rebase-parameters.t @ 27012:5eac7ab59b95

rebase: don't rebase obsolete commits with no successor This patch avoids unnecessary conflicts to resolve during rebase for the users of changeset evolution. This patch modifies rebase to skip obsolete commits with no successor. It introduces a new rebase state 'revpruned' for these revisions that are being skipped and a new message to inform the user of what is happening. This feature is gated behind the config flag experimental.rebaseskipobsolete When an obsolete commit is skipped, the output is: note: not rebasing 7:360bbaa7d3ce "O", it has no successor
author Laurent Charignon <lcharignon@fb.com>
date Wed, 18 Nov 2015 13:44:29 -0800
parents b885ab9ca182
children 157675d0f600
comparison
equal deleted inserted replaced
27011:53c668dc6b16 27012:5eac7ab59b95