Patchwork [2,of,3] commands: change rebase hint to point to resolve help

login
register
mail settings
Submitter timeless@mozdev.org
Date Sept. 9, 2015, 1:09 a.m.
Message ID <b8b8222bb2dc08088dd1.1441760966@waste.org>
Download mbox | patch
Permalink /patch/10433/
State Changes Requested
Headers show

Comments

timeless@mozdev.org - Sept. 9, 2015, 1:09 a.m.
# HG changeset patch
# User timeless@mozdev.org
# Date 1441748812 14400
#      Tue Sep 08 17:46:52 2015 -0400
# Node ID b8b8222bb2dc08088dd10a0191f2bcbaf94ecc40
# Parent  4e1590f55dbe54863ad1b3b7001ad7424e5203e4
commands: change rebase hint to point to resolve help
Pierre-Yves David - Sept. 9, 2015, 8:01 a.m.
On 09/08/2015 06:09 PM, timeless@mozdev.org wrote:
> # HG changeset patch
> # User timeless@mozdev.org
> # Date 1441748812 14400
> #      Tue Sep 08 17:46:52 2015 -0400
> # Node ID b8b8222bb2dc08088dd10a0191f2bcbaf94ecc40
> # Parent  4e1590f55dbe54863ad1b3b7001ad7424e5203e4
> commands: change rebase hint to point to resolve help

patches 1-2 seems obvious improvement.

However the tests are unhappy about them.

Failed test-rebase-conflicts.t: output changed
Failed test-graft.t: output changed
Failed test-rebase-detach.t: output changed
Failed test-rebase-parameters.t: output changed
Failed test-rebase-mq.t: output changed
Failed test-rebase-abort.t: output changed
Failed test-rebase-interruptions.t: output changed
Failed test-rebase-bookmarks.t: output changed
Failed test-rebase-mq-skip.t: output changed
Failed test-bookmarks-rebase.t: output changed
Failed test-rebase-check-restore.t: output changed
Failed test-issue1175.t: output changed
Failed test-check-commit-hg.t: output changed
Failed test-check-code-hg.t: output changed
Failed test-check-pyflakes.t: output changed
Failed test-largefiles-update.t: output changed

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -397,8 +397,9 @@ 
                                            collapsef, target)
                         if stats and stats[3] > 0:
                             raise error.InterventionRequired(
-                                _('unresolved conflicts (see hg '
-                                  'resolve, then hg rebase --continue)'))
+                                _('unresolved conflicts '
+                                  "(see 'hg help resolve', "
+                                  "then 'hg rebase --continue')"))
                     finally:
                         ui.setconfig('ui', 'forcemerge', '', 'rebase')
                 if not collapsef: