[PATCH 1 of 1 V2] histedit: abort if there are multiple roots in "--outgoing" revisions

FUJIWARA Katsunori foozy at lares.dti.ne.jp
Mon Sep 16 14:39:22 CDT 2013


At Thu, 12 Sep 2013 22:33:04 -0500,
Kevin Bullock wrote:
> 
> On 9 Sep 2013, at 8:51 AM, FUJIWARA Katsunori wrote:
> 
> > # HG changeset patch
> > # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
> > # Date 1378733863 -32400
> > #      Mon Sep 09 22:37:43 2013 +0900
> > # Node ID f0edc4e70f976b20d0c886a287b472a629789329
> > # Parent  1d07bf106c2ad1c7ef5e257e754ca8d858bd04b0
> > histedit: abort if there are multiple roots in "--outgoing" revisions
> 
> LGTM except that I think we need to bikeshed the messages we give the user here. Telling them the outgoing changesets have "multiple roots" will be terrifying. I don't have any better suggestions, though (yet).

What about the idea blow ?

  - show abort message "there are outgoing revisions which may confuse
    users" (and the hint to lead users to "hg help histedit"), and

  - explain more detail about "--outgoing", like:

      For safety, this command is aborted, also if there are outgoing
      revisions which may confuse users: for example, there may be
      another unexpected outgoing branches, if number of "root
      revisions in outgoings" is two or more.

      Use "min(outgoing() and ::.)" or similar revset expression as
      ANCESTOR instead of "--outgoing" option, to specify only one
      root of outgoing ancestors of the working directory in such
      ambiguous situation. Please see :hg:`help revsets` for detail
      about selecting revisions.


I hope revise for messages by native speakers :-)


----------------------------------------------------------------------
[FUJIWARA Katsunori]                             foozy at lares.dti.ne.jp


More information about the Mercurial-devel mailing list