| Submitter | timeless@mozdev.org |
|---|---|
| Date | Sept. 25, 2015, 8:04 a.m. |
| Message ID | <08351d3f0a851d8ec66c.1443168293@waste.org> |
| Download | mbox | patch |
| Permalink | /patch/10633/ |
| State | Accepted |
| Headers | show |
Comments
On Fri, Sep 25, 2015 at 03:04:53AM -0500, timeless@mozdev.org wrote: > # HG changeset patch > # User timeless@mozdev.org > # Date 1443167506 14400 > # Fri Sep 25 03:51:46 2015 -0400 > # Node ID 08351d3f0a851d8ec66cd48e8cc40ab066e2e22a > # Parent b80b2ee71a08d00ec4008f3131bdf3c72e4ec2ba > resolve: consistently describe re-merge + unresolved queued, thanks! > > diff --git a/mercurial/commands.py b/mercurial/commands.py > --- a/mercurial/commands.py > +++ b/mercurial/commands.py > @@ -5420,7 +5420,7 @@ > raise util.Abort(_("can't specify --all and patterns")) > if not (all or pats or show or mark or unmark): > raise util.Abort(_('no files or directories specified'), > - hint=('use --all to remerge all files')) > + hint=('use --all to re-merge all unresolved files')) > > if show: > fm = ui.formatter('resolve', opts) > diff --git a/tests/test-merge9.t b/tests/test-merge9.t > --- a/tests/test-merge9.t > +++ b/tests/test-merge9.t > @@ -77,7 +77,7 @@ > resolve all warning > $ hg resolve > abort: no files or directories specified > - (use --all to remerge all files) > + (use --all to re-merge all unresolved files) > [255] > > resolve all > diff --git a/tests/test-resolve.t b/tests/test-resolve.t > --- a/tests/test-resolve.t > +++ b/tests/test-resolve.t > @@ -129,7 +129,7 @@ > resolve without arguments should suggest --all > $ hg resolve > abort: no files or directories specified > - (use --all to remerge all files) > + (use --all to re-merge all unresolved files) > [255] > > resolve --all should re-merge all unresolved files > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > https://selenic.com/mailman/listinfo/mercurial-devel
Patch
diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -5420,7 +5420,7 @@ raise util.Abort(_("can't specify --all and patterns")) if not (all or pats or show or mark or unmark): raise util.Abort(_('no files or directories specified'), - hint=('use --all to remerge all files')) + hint=('use --all to re-merge all unresolved files')) if show: fm = ui.formatter('resolve', opts) diff --git a/tests/test-merge9.t b/tests/test-merge9.t --- a/tests/test-merge9.t +++ b/tests/test-merge9.t @@ -77,7 +77,7 @@ resolve all warning $ hg resolve abort: no files or directories specified - (use --all to remerge all files) + (use --all to re-merge all unresolved files) [255] resolve all diff --git a/tests/test-resolve.t b/tests/test-resolve.t --- a/tests/test-resolve.t +++ b/tests/test-resolve.t @@ -129,7 +129,7 @@ resolve without arguments should suggest --all $ hg resolve abort: no files or directories specified - (use --all to remerge all files) + (use --all to re-merge all unresolved files) [255] resolve --all should re-merge all unresolved files