Patchwork [evolve-ext] relocate: fix typo

login
register
mail settings
Submitter Faheem Mitha
Date Aug. 10, 2014, 8:30 p.m.
Message ID <1eac86edc6c26a1951d8.1407702631@orwell.homelinux.org>
Download mbox | patch
Permalink /patch/5336/
State Accepted
Headers show

Comments

Faheem Mitha - Aug. 10, 2014, 8:30 p.m.
# HG changeset patch
# User Faheem Mitha <faheem@faheem.info>
# Date 1407702429 -19800
#      Mon Aug 11 01:57:09 2014 +0530
# Node ID 1eac86edc6c26a1951d83dac6208ad7ffec7fc25
# Parent  d2fe19c818ea2e6a65e1fe99de699807270b49d4
relocate: fix typo
Pierre-Yves David - Aug. 10, 2014, 8:48 p.m.
On 08/10/2014 01:30 PM, Faheem Mitha wrote:
> # HG changeset patch
> # User Faheem Mitha <faheem@faheem.info>
> # Date 1407702429 -19800
> #      Mon Aug 11 01:57:09 2014 +0530
> # Node ID 1eac86edc6c26a1951d83dac6208ad7ffec7fc25
> # Parent  d2fe19c818ea2e6a65e1fe99de699807270b49d4
> relocate: fix typo

pushed thanks

(queued)

Patch

diff -r d2fe19c818ea -r 1eac86edc6c2 hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -852,7 +852,7 @@ 
     if not orig.p2().rev() == node.nullrev:
         raise util.Abort(
             'no support for evolving merge changesets yet',
-            hint="Redo the merge a use `hg prune` to obsolete the old one")
+            hint="Redo the merge and use `hg prune` to obsolete the old one")
     destbookmarks = repo.nodebookmarks(dest.node())
     nodesrc = orig.node()
     destphase = repo[nodesrc].phase()