[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mercurial-devel
Subject:    Re: [PATCH 1 of 3] mergetools.hgrc: set vimdiff to check=changed
From:       Pierre-Yves David <pierre-yves.david () logilab ! fr>
Date:       2012-08-30 15:06:08
Message-ID: 20120830150608.GC4864 () crater1 ! logilab ! fr
[Download RAW message or body]

[Attachment #2 (multipart/signed)]


The patch bellow is unambiguously a fix and probably deserve to land in stable
before 2.3.1. Does it need a resent ?

On Thu, Aug 02, 2012 at 02:21:50PM +0200, pierre-yves.david@logilab.fr wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@logilab.fr>
> # Date 1343908309 -7200
> # Branch stable
> # Node ID 192441ab174c489bd7bbc61d8bd0e4658f79aeaf
> # Parent  e15765c18ebc18448addb955d2b698c75fc8b380
> mergetools.hgrc: set vimdiff to check=changed
> 
> The standard reaction in from of unexpected vimdiff is to ":quit". This will
> make vimdiff return a 0 status even if no merge were done at all.
> 
> This change detect that nothing have been changed in vimdiff as a potential
> unresolved conflict.
> 
> diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
> --- a/contrib/mergetools.hgrc
> +++ b/contrib/mergetools.hgrc
> @@ -14,10 +14,11 @@ gvimdiff.regkey=Software\Vim\GVim
>  gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim
>  gvimdiff.regname=path
>  gvimdiff.priority=-9
>  
>  vimdiff.args=$local $other $base
> +vimdiff.check=changed
>  vimdiff.priority=-10
>  
>  merge.checkconflicts=True
>  merge.priority=-100
>  

-- 
Pierre-Yves David

http://www.logilab.fr/


["signature.asc" (application/pgp-signature)]

_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@selenic.com
http://selenic.com/mailman/listinfo/mercurial-devel


[prev in list] [next in list] [prev in thread] [next in thread]