[PATCH] rebase: abort message should appear even with --quiet

Steve Borho steve at borho.org
Tue Oct 26 10:07:11 CDT 2010


On Tue, Oct 26, 2010 at 6:49 AM, timeless <timeless at gmail.com> wrote:
> # HG changeset patch
> # User timeless <timeless at gmail.com>
> # Date 1288093318 -10800
> # Node ID 0009d6d29ab4bc7706d8417b31fce4f57bd01c4b
> # Parent  850617e3a5cc060e19d03ef5601985f6920823c9
> rebase: abort message should appear even with --quiet

(apologies for pseudo-hijacking this thread)

A similar problem is that rebase reacts badly to unresolved merges.
It raises a util.Abort() exception rather than your typical ui.warn()
and exit with non-0 return code.  I think it should behave very
similar to the merge command when it sees unresolved files.

Current behavior:

abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
[0]

Preferred behavior:

fix %d unresolved conflicts with hg resolve then run hg rebase --continue
[1]

-- 
Steve Borho


More information about the Mercurial-devel mailing list