Patchwork obsolete: fix minor module documentation issues

login
register
mail settings
Submitter liscju
Date Sept. 2, 2016, 8:20 a.m.
Message ID <c53ddb8f36d5e0efc20e.1472804441@liscju-VirtualBox>
Download mbox | patch
Permalink /patch/16528/
State Accepted
Headers show

Comments

liscju - Sept. 2, 2016, 8:20 a.m.
# HG changeset patch
# User liscju <piotr.listkiewicz@gmail.com>
# Date 1472804336 -7200
#      Fri Sep 02 10:18:56 2016 +0200
# Node ID c53ddb8f36d5e0efc20ebcdcbd95a5cf12912911
# Parent  f148bfa40489269be2e48046734f81065129847a
obsolete: fix minor module documentation issues
Augie Fackler - Sept. 2, 2016, 2:55 p.m.
> On Sep 2, 2016, at 04:20, liscju <piotr.listkiewicz@gmail.com> wrote:
> 
> # HG changeset patch
> # User liscju <piotr.listkiewicz@gmail.com>
> # Date 1472804336 -7200
> #      Fri Sep 02 10:18:56 2016 +0200
> # Node ID c53ddb8f36d5e0efc20ebcdcbd95a5cf12912911
> # Parent  f148bfa40489269be2e48046734f81065129847a
> obsolete: fix minor module documentation issues

Queued this, thanks.

> 
> diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py
> --- a/mercurial/obsolete.py
> +++ b/mercurial/obsolete.py
> @@ -42,9 +42,9 @@ Examples:
> 
>     (A, ())
> 
> -- When changeset A is split into B and C, a single marker are used:
> +- When changeset A is split into B and C, a single marker is used:
> 
> -    (A, (C, C))
> +    (A, (B, C))
> 
>   We use a single marker to distinguish the "split" case from the "divergence"
>   case. If two independent operations rewrite the same changeset A in to A' and
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py
--- a/mercurial/obsolete.py
+++ b/mercurial/obsolete.py
@@ -42,9 +42,9 @@  Examples:
 
     (A, ())
 
-- When changeset A is split into B and C, a single marker are used:
+- When changeset A is split into B and C, a single marker is used:
 
-    (A, (C, C))
+    (A, (B, C))
 
   We use a single marker to distinguish the "split" case from the "divergence"
   case. If two independent operations rewrite the same changeset A in to A' and