Wed, 18 Nov 2015 13:44:29 -0800 rebase: don't rebase obsolete commits with no successor
Laurent Charignon <lcharignon@fb.com> [Wed, 18 Nov 2015 13:44:29 -0800] rev 27012
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
Wed, 18 Nov 2015 13:46:42 -0800 rebase: fix a typo in test-rebase-obsolete
Laurent Charignon <lcharignon@fb.com> [Wed, 18 Nov 2015 13:46:42 -0800] rev 27011
rebase: fix a typo in test-rebase-obsolete We had left a lonely single quote where it shouldn't be!
(0) -10000 -3000 -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 +1000 +3000 +10000 tip