[PATCH v4] rebase: rebase changesets in topo order (issue5370) (BC)

Xidorn Quan me at upsuper.org
Fri Sep 23 21:03:53 EDT 2016


On Sat, Sep 24, 2016, at 11:01 AM, Pierre-Yves David wrote:
> On 09/24/2016 01:17 AM, Xidorn Quan wrote:
> > # HG changeset patch
> > # User Xidorn Quan <me at upsuper.org>
> > # Date 1474095776 -36000
> > #      Sat Sep 17 17:02:56 2016 +1000
> > # Node ID 2aaff71d4ea74c38a2397033654ebb3567957ae2
> > # Parent  285a8c3e53f2183438f0cdbc238e4ab851d0d110
> > rebase: rebase changesets in topo order (issue5370) (BC)
> >
> > There are two reasons that rebase should be done this way:
> > 1. This would make rebasing faster because it would minimize the total
> >    number of files to be checked out in the process, as it don't need
> >    to switch back and forth between branches.
> > 2. It makes resolving conflicts easier as user has a better context.
> >
> > This commit changes the behavior in "Test multiple root handling" of
> > test-rebase-obsolete.t. It is an expected change which reflects the new
> > behavior that commits in a branch are grouped together when rebased.
> 
> Pushed, thank you very much.

Thanks for your review.

- Xidorn


More information about the Mercurial-devel mailing list