[PATCH] rebase: turn rebaseskipobsolete on by default
Sean Farley
sean at farley.io
Mon Mar 7 16:49:49 EST 2016
Kostia Balytskyi <ikostia at fb.com> writes:
> # HG changeset patch
> # User Kostia Balytskyi <ikostia at fb.com>
> # Date 1457365615 28800
> # Mon Mar 07 07:46:55 2016 -0800
> # Node ID 9ebdb69bcb762c95c1f3c1a98416df656e672604
> # Parent ffd3ac07b1d79dda7f57bd826208fdaf92a76717
> rebase: turn rebaseskipobsolete on by default
>
> As per plan desribed in https://goo.gl/iMUKzY, we want to turn
> rebaseskipobsolete on by default. Please note that issue4210
> is not a blocker since we have a warning that will tell user
> about the potential divergence now.
Minor nit: could we just have the full URL in the commit message?
https://www.mercurial-scm.org/wiki/ChangesetEvolutionDevel#Using_Obsolescence_Marker_during_Rebase
It allows us to see the title without having to click on it.
> diff --git a/hgext/rebase.py b/hgext/rebase.py
> --- a/hgext/rebase.py
> +++ b/hgext/rebase.py
> @@ -297,7 +297,8 @@ def rebase(ui, repo, **opts):
> hint=_('use --keep to keep original changesets'))
>
> obsoletenotrebased = {}
> - if ui.configbool('experimental', 'rebaseskipobsolete'):
> + if ui.configbool('experimental',
> + 'rebaseskipobsolete', default=True):
This seems fine to me and step in the good, ol' evolve direction but I
will defer to others.
More information about the Mercurial-devel
mailing list