Mercurial > hg-stable
changeset 27676:1c48f348f2d0
transplant: correct language to use working directory
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Tue, 05 Jan 2016 22:46:04 +0000 |
| parents | d073f4c70575 |
| children | 128ef8828ed5 |
| files | hgext/transplant.py tests/test-largefiles-update.t tests/test-transplant.t |
| diffstat | 3 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/transplant.py Wed Dec 23 21:30:38 2015 +0000 +++ b/hgext/transplant.py Tue Jan 05 22:46:04 2016 +0000 @@ -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
--- a/tests/test-largefiles-update.t Wed Dec 23 21:30:38 2015 +0000 +++ b/tests/test-largefiles-update.t Tue Jan 05 22:46:04 2016 +0000 @@ -623,7 +623,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
--- a/tests/test-transplant.t Wed Dec 23 21:30:38 2015 +0000 +++ b/tests/test-transplant.t Tue Jan 05 22:46:04 2016 +0000 @@ -402,7 +402,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 @@ -416,7 +416,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] $ cp .hg/transplant/journal .hg/transplant/journal.orig $ cat .hg/transplant/journal @@ -459,7 +459,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 @@ -506,7 +506,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 @@ -675,7 +675,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 .. @@ -844,7 +844,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 @@ -927,7 +927,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]