# HG changeset patch # User Pierre-Yves David # Date 1406751253 25200 # Node ID a010ba5a0ffb58c9d6f3fb65762ee9863d938768 # Parent 1d8ba82440012bee2ac85b8f590156f437da3ffc evolve: deprecated --obsolete and --old-obsolete option on commit and graft Such option are unlikely to make it into core, so we deprecate them to avoid uer discovery them and getting used to them. diff -r 1d8ba8244001 -r a010ba5a0ffb README --- a/README Fri Jul 25 17:13:54 2014 +0200 +++ b/README Wed Jul 30 13:14:13 2014 -0700 @@ -62,6 +62,8 @@ - amend: add -D/--current-date option - amend: add -U/--current-user option - evolve: add a --tool option +- mark "commit -o", "graft -o" and "graft -O" as deprecated since they are + unlikely to eventually make it into core. - push obsmarkers and phases in the same transaction than changesets (when using hg >= 3.1 and bundle2-exp is enabled) diff -r 1d8ba8244001 -r a010ba5a0ffb hgext/evolve.py --- a/hgext/evolve.py Fri Jul 25 17:13:54 2014 +0200 +++ b/hgext/evolve.py Wed Jul 30 13:14:13 2014 -0700 @@ -2221,12 +2221,12 @@ entry = cmdutil.findcmd('commit', commands.table)[1] entry[1].append(('o', 'obsolete', [], - _("make commit obsolete this revision"))) + _("make commit obsolete this revision (DEPRECATED)"))) entry = cmdutil.findcmd('graft', commands.table)[1] entry[1].append(('o', 'obsolete', [], - _("make graft obsoletes this revision"))) + _("make graft obsoletes this revision (DEPRECATED)"))) entry[1].append(('O', 'old-obsolete', False, - _("make graft obsoletes its source"))) + _("make graft obsoletes its source (DEPRECATED)"))) ##################################################################### ### Obsolescence marker exchange experimenation ###