[PATCH] merge: tone down 'divergent renames' message

[Dan Villiom Podlaski Christiansen]

On 16 Oct 2010, at 10:55, Adrian Buehlmann wrote:

> On 16.10.2010 10:36, Adrian Buehlmann wrote:
>> # HG changeset patch
>> # User Adrian Buehlmann <adrian at cadifra.com>
>> # Date 1287217652 -7200
>> # Node ID 55c72fc79c3442390847e65482a71292d3936613
>> # Parent  8888e56ac4171d34960348a9ba0043317907fe4e
>> merge: tone down 'divergent renames' message
>>
>> Note to patch reviewers:
>>
>> We have precedent for 'repo.ui.warn(_("note: ..."))' in
>> discovery.prepush
>>
>
> See also http://markmail.org/thread/vpohvt2amk6vepva
>
> Matt's comment: http://markmail.org/message/7mvkgq7agopojety
>
> Toning down the message text seems like a good compromise to me.

I just folded this into a patch I had lying around which made the  
error message less ‘magical’. Perhaps you'd like to take a look at it?

--

Dan Villiom Podlaski Christiansen
danchr at gmail.com

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 1943 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20101016/3b010ef7/attachment.bin>