Patchwork D8295: rebase: mention -r argument in synposis

login
register
mail settings
Submitter phabricator
Date March 14, 2020, 2:37 a.m.
Message ID <differential-rev-PHID-DREV-u4b3oseod75e7snnnmge-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/45786/
State Superseded
Headers show

Comments

phabricator - March 14, 2020, 2:37 a.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I'm guessing that we simply forgot to mention it there. I was
  wondering if maybe `-r` was experimental as long as evolution is, but
  that doesn't seem to be the case (`-r` is not marked experimental).

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8295

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel
phabricator - March 14, 2020, 3:42 a.m.
mharbison72 added a comment.
mharbison72 accepted this revision.


  Weird, I thought this was dependent on evolve too.  But I guess if that were really the case, it would have be implemented in a wrapper in evolve.  I suppose it works without evolve if using `--keep`, but I never use that.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8295/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8295

To: martinvonz, #hg-reviewers, mharbison72
Cc: mharbison72, mercurial-devel
phabricator - March 14, 2020, 9:34 a.m.
marmoute added a comment.


  In D8295#123832 <https://phab.mercurial-scm.org/D8295#123832>, @mharbison72 wrote:
  
  > Weird, I thought this was dependent on evolve too.  But I guess if that were really the case, it would have be implemented in a wrapper in evolve.  I suppose it works without evolve if using `--keep`, but I never use that.
  
  It is more that without the ability to create orphan, the flag usefulness is much more limited.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8295/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8295

To: martinvonz, #hg-reviewers, mharbison72, pulkit
Cc: marmoute, mharbison72, mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -871,7 +871,7 @@ 
     + cmdutil.dryrunopts
     + cmdutil.formatteropts
     + cmdutil.confirmopts,
-    _(b'[-s REV | -b REV] [-d REV] [OPTION]'),
+    _(b'[-s REV | -b REV | [-r REV]...] [-d REV] [OPTION]...'),
     helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
 )
 def rebase(ui, repo, **opts):