Patchwork diff: clarify comparison as first parent

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 18, 2015, 7:06 p.m.
Message ID <3bcfe6445cfe03119ac0.1450465572@waste.org>
Download mbox | patch
Permalink /patch/12164/
State Accepted
Headers show

Comments

timeless@mozdev.org - Dec. 18, 2015, 7:06 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450464745 0
#      Fri Dec 18 18:52:25 2015 +0000
# Node ID 3bcfe6445cfe03119ac05bf57e00e50925826ce5
# Parent  2916ebaef3129451bfd4f9f62487e70f74124d46
diff: clarify comparison as first parent
Matt Mackall - Dec. 20, 2015, 10:41 p.m.
On Fri, 2015-12-18 at 13:06 -0600, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1450464745 0
> #      Fri Dec 18 18:52:25 2015 +0000
> # Node ID 3bcfe6445cfe03119ac05bf57e00e50925826ce5
> # Parent  2916ebaef3129451bfd4f9f62487e70f74124d46
> diff: clarify comparison as first parent

Queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3534,7 +3534,7 @@ 
     between those revisions. If only one revision is specified then
     that revision is compared to the working directory, and, when no
     revisions are specified, the working directory files are compared
-    to its parent.
+    to its first parent.
 
     Alternatively you can specify -c/--change with a revision to see
     the changes in that changeset relative to its first parent.
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -503,7 +503,7 @@ 
       When two revision arguments are given, then changes are shown between
       those revisions. If only one revision is specified then that revision is
       compared to the working directory, and, when no revisions are specified,
-      the working directory files are compared to its parent.
+      the working directory files are compared to its first parent.
   
       Alternatively you can specify -c/--change with a revision to see the
       changes in that changeset relative to its first parent.