[PATCH] merge: make 'diverging renames' diagnostic a more helpful note

[Adrian Buehlmann]

On 16.10.2010 22:42, Dan Villiom Podlaski Christiansen wrote:
> # HG changeset patch
> # User Dan Villiom Podlaski Christiansen <danchr at gmail.com>
> # Date 1286722225 18000
> # Node ID 1f3967e22f5c2f5daf896e92221e84acb587e1ca
> # Parent  86e555754305c8e433ae1542eaedbc5acbb40734
> merge: make 'diverging renames' diagnostic a more helpful note.
> 
> See the Hg Book on why we actually want to detect this case:
> http://hgbook.red-bean.com/read/mercurial-in-daily-use.html#id364290
> 
> Before:
> 
> $ hg up deadbeef
> warning: detected divergent renames of X to:
> ...
> 
> After:
> 
> $ hg up deadbeef
> note: possible conflict - X was renamed multiple times to:
> ...
> 
> No functionality change.
> 

I would be fine with that as well.