[PATCH] merge/resolve: better error messages to lead users to hg update --clean to abandon merges
Augie Fackler
durin42 at gmail.com
Wed Mar 4 21:30:03 UTC 2009
On Mar 4, 2009, at 3:17 PM, Bill Barry wrote:
> Augie Fackler wrote:
>> + 'specific revision\nor abandon'
>> + " the merge with 'hg up --clean'"))
> <snip>
>> + repo.ui.status(_("use 'hg resolve' to retry unresolved
>> file merges "
>> + "or 'hg up --clean' to abandon\n"))
>
> IMO you should use the full command name in help text ('hg update --
> clean')
I can, but for the second case that'll turn a one-line status message
into two, which I was hoping to avoid.
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>
More information about the Mercurial-devel
mailing list