Wed, 18 Nov 2015 15:58:06 -0800 rebase: refactoring to avoid repetition of expression
Laurent Charignon <lcharignon@fb.com> [Wed, 18 Nov 2015 15:58:06 -0800] rev 27014
rebase: refactoring to avoid repetition of expression This patch removes the repetition of "(revignored, revprecursor, revpruned)" and replaces its occurences with the more legible "revskipped".
Wed, 18 Nov 2015 16:06:00 -0800 rebase: remove an unused todo
Laurent Charignon <lcharignon@fb.com> [Wed, 18 Nov 2015 16:06:00 -0800] rev 27013
rebase: remove an unused todo Since we handled skipping obsolete revs when it is relevant, this todo is no longer useful. We replace the comment with two useful comments.
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 -4 +4 +10 +30 +100 +300 +1000 +3000 +10000 tip