Improving "abort: can't merge with ancestor"

timeless timeless at gmail.com
Tue Apr 6 19:07:06 CDT 2010


On Tue, Apr 6, 2010 at 9:24 PM, Greg Ward <greg at gerg.ca> wrote:
>  abort: can't merge with ancestor

>  abort: nothing to merge: merge source (960ab17c3c4e) already an
> ancestor of target

> Not sure if including the cset id is a good idea.  It makes the
> English message 82 chars, which is about... umm... 12 chars too long.
> Gee, where can I save 12 chars from that message?  ;-)

abort: can't merge already included changeset (960ab17c3c4e)

--
> abort: nothing to merge found (the given changeset is an ancestor of this changeset)
> abort: nothing to merge found (this changeset already descends from the given changeset)
> abort: nothing to merge found (branch '%s' only contains one head)
> abort: nothing to merge found (the default branch only contains one head)

are we really trying to retain 'nothing to merge [found]' (the found
part is misplaced)

it should probably be 'nothing found to merge' or 'found nothing to
merge' or something.


More information about the Mercurial-devel mailing list