Patchwork [2,of,2,STABLE] histedit: add more detailed help about "--outgoing"

login
register
mail settings
Submitter Katsunori FUJIWARA
Date Sept. 30, 2013, 3:14 p.m.
Message ID <910deb3d522f37669ce8.1380554047@juju>
Download mbox | patch
Permalink /patch/2668/
State Superseded
Headers show

Comments

Katsunori FUJIWARA - Sept. 30, 2013, 3:14 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1380553954 -32400
#      Tue Oct 01 00:12:34 2013 +0900
# Branch stable
# Node ID 910deb3d522f37669ce8a3b7809fe7c6060e59f7
# Parent  983399087189f2572bf5a26b20c396a0d9ade9b3
histedit: add more detailed help about "--outgoing"

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -466,6 +466,15 @@ 
     With --outgoing, this edits changesets not found in the
     destination repository. If URL of the destination is omitted, the
     'default-push' (or 'default') path will be used.
+
+    For safety, this command is aborted, also if there are ambiguous
+    outgoing revisions which may confuse users: for example, there are
+    multiple branches containing outgoing revisions.
+
+    Use "min(outgoing() and ::.)" or similar revset specification
+    instead of --outgoing to specify edit target revision exactly in
+    such ambiguous situation. See :hg:`help revsets` for detail about
+    selecting revisions.
     """
     # TODO only abort if we try and histedit mq patches, not just
     # blanket if mq patches are applied somewhere