[PATCH] merge: when current branch has 1 or > 2 heads, actually abort

Matt Mackall mpm at selenic.com
Tue Jun 15 16:48:59 CDT 2010


On Tue, 2010-06-15 at 13:25 -0400, Greg Ward wrote:
> On Tue, Jun 15, 2010 at 11:13 AM, Martin Geisler <mg at lazybytes.net> wrote:
> > Hehe :-) You probably missed the :hg:`foo` commands in the docstrings,
> > they are turned into "hg foo" in the output. This can of course be
> > changed in minirst.py, though I like it the way it is now.
> 
> Oh yeah... I forgot that (mini)RST emits double quotes.
> 
> And they don't require escaping, which makes the patch that started
> this discussion slightly less objectionable.  (I think.)
> 
> So I now favour double quotes when hg is printing a message to the
> user recommending the next command to run.  "I'm not inconsistent, I'm
> flexible!"  I'll resend my merge patch accordingly.

Ok, but really, I only want to see one thing at a time. One patch to fix
the return handling, and no other changes (ie the version I already have
queued). This should (and does) have no test changes.

Then another to go through and change all the inconsistent quoting of
commands in messages. This should have very straightforward-to-review
changes to the test output.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list