Patchwork hg: fix typo in hg merge documentation

login
register
mail settings
Submitter via Mercurial-devel
Date Oct. 20, 2017, 10:52 p.m.
Message ID <CAJFKZR2MsQ2F0VqwRxUJP=t3t759XDh+XwQrV61zmBBQRrEUuw@mail.gmail.com>
Download mbox | patch
Permalink /patch/25266/
State Accepted
Headers show

Comments

via Mercurial-devel - Oct. 20, 2017, 10:52 p.m.
# HG changeset patch
# User Joe Blaylock <jrbl@google.com>
# Date 1508534146 25200
#      Fri Oct 20 14:15:46 2017 -0700
# Branch stable
# Node ID c89ef6ec5755c240883efc765a9b1802ba312ce7
# Parent  5539a6acfd77d4f3117c5944efce53b293b05b6a
hg: fix typo in hg merge documentation
Yuya Nishihara - Oct. 22, 2017, 2:03 a.m.
On Fri, 20 Oct 2017 15:52:48 -0700, Joe Blaylock via Mercurial-devel wrote:
> # HG changeset patch
> # User Joe Blaylock <jrbl@google.com>
> # Date 1508534146 25200
> #      Fri Oct 20 14:15:46 2017 -0700
> # Branch stable
> # Node ID c89ef6ec5755c240883efc765a9b1802ba312ce7
> # Parent  5539a6acfd77d4f3117c5944efce53b293b05b6a
> hg: fix typo in hg merge documentation

Queued for stable, thanks.

> diff --git a/tests/test-help.t b/tests/test-help.t
> --- a/tests/test-help.t
> +++ b/tests/test-help.t
> @@ -1792,7 +1792,7 @@
>          accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
>          they will be placed in the same directory as "a.txt".
> 
> -        This implies permerge. Therefore, files aren't dumped, if premerge runs
> +        This implies premerge. Therefore, files aren't dumped, if premerge runs
>          successfully. Use :forcedump to forcibly write files out.
> 

Appears that whitespace damaged. Next time, please use the patchbomb extension
for emailing patches. Phabricator will also serve well.

https://www.mercurial-scm.org/wiki/ContributingChanges#Emailing_patches

Patch

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -459,7 +459,7 @@ 
     ``a.txt.other`` and ``a.txt.base`` and they will be placed in the
     same directory as ``a.txt``.

-    This implies permerge. Therefore, files aren't dumped, if premerge
+    This implies premerge. Therefore, files aren't dumped, if premerge
     runs successfully. Use :forcedump to forcibly write files out.
     """
     a = _workingpath(repo, fcd)
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -1792,7 +1792,7 @@ 
         accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
         they will be placed in the same directory as "a.txt".

-        This implies permerge. Therefore, files aren't dumped, if premerge runs
+        This implies premerge. Therefore, files aren't dumped, if premerge runs
         successfully. Use :forcedump to forcibly write files out.

       ":fail"