Patchwork [2,of,4] transplant: correct language to use working directory

login
register
mail settings
Submitter timeless@mozdev.org
Date Jan. 6, 2016, 5:12 a.m.
Message ID <8f40cd2a9924a0f024a5.1452057155@waste.org>
Download mbox | patch
Permalink /patch/12558/
State Accepted
Headers show

Comments

timeless@mozdev.org - Jan. 6, 2016, 5:12 a.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1452033964 0
#      Tue Jan 05 22:46:04 2016 +0000
# Node ID 8f40cd2a9924a0f024a58dcda5d737347849b87b
# Parent  3cfba7249e5d046e380b3b386f6f05c575a00c5d
transplant: correct language to use working directory

Patch

diff --git a/hgext/transplant.py b/hgext/transplant.py
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -282,7 +282,7 @@ 
                 p2 = node
                 self.log(user, date, message, p1, p2, merge=merge)
                 self.ui.write(str(inst) + '\n')
-                raise TransplantError(_('fix up the merge and run '
+                raise TransplantError(_('fix up the working directory and run '
                                         'hg transplant --continue'))
         else:
             files = None
diff --git a/tests/test-largefiles-update.t b/tests/test-largefiles-update.t
--- a/tests/test-largefiles-update.t
+++ b/tests/test-largefiles-update.t
@@ -622,7 +622,7 @@ 
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file .hglf/large1.rej
   patch failed to apply
-  abort: fix up the merge and run hg transplant --continue
+  abort: fix up the working directory and run hg transplant --continue
   [255]
   $ hg status -A large1
   C large1
diff --git a/tests/test-transplant.t b/tests/test-transplant.t
--- a/tests/test-transplant.t
+++ b/tests/test-transplant.t
@@ -368,7 +368,7 @@ 
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file foo.rej
   patch failed to apply
-  abort: fix up the merge and run hg transplant --continue
+  abort: fix up the working directory and run hg transplant --continue
   [255]
 
 transplant -c shouldn't use an old changeset
@@ -382,7 +382,7 @@ 
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file foo.rej
   patch failed to apply
-  abort: fix up the merge and run hg transplant --continue
+  abort: fix up the working directory and run hg transplant --continue
   [255]
   $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg transplant --continue -e
   HGEDITFORM=transplant.normal
@@ -413,7 +413,7 @@ 
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file baz.rej
   patch failed to apply
-  abort: fix up the merge and run hg transplant --continue
+  abort: fix up the working directory and run hg transplant --continue
   [255]
   $ echo fixed > baz
   $ hg transplant --continue
@@ -460,7 +460,7 @@ 
   Hunk #1 FAILED at 0
   1 out of 1 hunks FAILED -- saving rejects to file a.rej
   patch failed to apply
-  abort: fix up the merge and run hg transplant --continue
+  abort: fix up the working directory and run hg transplant --continue
   [255]
   $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg transplant --continue -e
   HGEDITFORM=transplant.merge
@@ -612,7 +612,7 @@ 
   file b1 already exists
   1 out of 1 hunks FAILED -- saving rejects to file b1.rej
   patch failed to apply
-  abort: fix up the merge and run hg transplant --continue
+  abort: fix up the working directory and run hg transplant --continue
   [255]
   $ cd ..
 
@@ -778,7 +778,7 @@ 
   file b already exists
   1 out of 1 hunks FAILED -- saving rejects to file b.rej
   patch failed to apply
-  abort: fix up the merge and run hg transplant --continue
+  abort: fix up the working directory and run hg transplant --continue
   [255]
   $ hg status
   ? b.rej
@@ -861,7 +861,7 @@ 
   22c515968f13 transplanted to * (glob)
   applying e38700ba9dd3
   intentional error while patching
-  abort: fix up the merge and run hg transplant --continue
+  abort: fix up the working directory and run hg transplant --continue
   [255]
   $ cat >> .hg/hgrc <<EOF
   > [hooks]