Patchwork [2,of,2] help: filesets show hg resolve command

login
register
mail settings
Submitter timeless@mozdev.org
Date Sept. 8, 2015, 5:52 p.m.
Message ID <79079707ab1dbf7f4f9a.1441734761@waste.org>
Download mbox | patch
Permalink /patch/10421/
State Accepted
Headers show

Comments

timeless@mozdev.org - Sept. 8, 2015, 5:52 p.m.
# HG changeset patch
# User timeless@mozdev.org
# Date 1441726522 14400
#      Tue Sep 08 11:35:22 2015 -0400
# Node ID 79079707ab1dbf7f4f9a10f1469302c72c96adaa
# Parent  edec87d17ccf0034c93a624a0d59f8e2db2f55bc
help: filesets show hg resolve command
Augie Fackler - Sept. 9, 2015, 2:47 p.m.
On Tue, Sep 08, 2015 at 12:52:41PM -0500, timeless@mozdev.org wrote:
> # HG changeset patch
> # User timeless@mozdev.org
> # Date 1441726522 14400
> #      Tue Sep 08 11:35:22 2015 -0400
> # Node ID 79079707ab1dbf7f4f9a10f1469302c72c96adaa
> # Parent  edec87d17ccf0034c93a624a0d59f8e2db2f55bc
> help: filesets show hg resolve command

queued, thanks

>
> diff --git a/mercurial/fileset.py b/mercurial/fileset.py
> --- a/mercurial/fileset.py
> +++ b/mercurial/fileset.py
> @@ -243,7 +243,7 @@
>
>  def resolved(mctx, x):
>      """``resolved()``
> -    File that is marked resolved according to the resolve state.
> +    File that is marked resolved according to :hg:`resolve -l`.
>      """
>      # i18n: "resolved" is a keyword
>      getargs(x, 0, 0, _("resolved takes no arguments"))
> @@ -254,7 +254,7 @@
>
>  def unresolved(mctx, x):
>      """``unresolved()``
> -    File that is marked unresolved according to the resolve state.
> +    File that is marked unresolved according to :hg:`resolve -l`.
>      """
>      # i18n: "unresolved" is a keyword
>      getargs(x, 0, 0, _("unresolved takes no arguments"))
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/mercurial/fileset.py b/mercurial/fileset.py
--- a/mercurial/fileset.py
+++ b/mercurial/fileset.py
@@ -243,7 +243,7 @@ 
 
 def resolved(mctx, x):
     """``resolved()``
-    File that is marked resolved according to the resolve state.
+    File that is marked resolved according to :hg:`resolve -l`.
     """
     # i18n: "resolved" is a keyword
     getargs(x, 0, 0, _("resolved takes no arguments"))
@@ -254,7 +254,7 @@ 
 
 def unresolved(mctx, x):
     """``unresolved()``
-    File that is marked unresolved according to the resolve state.
+    File that is marked unresolved according to :hg:`resolve -l`.
     """
     # i18n: "unresolved" is a keyword
     getargs(x, 0, 0, _("unresolved takes no arguments"))