Mercurial > hg
view contrib/vim/HGAnnotate.vim @ 44909:d452acc8cce8 stable
flags: account for flag change when tracking rename relevant to merge
There are some logic filtering rename to the one relevant to the merge. That
logic was oblivious of flag change, leading to exec flag being dropped when
merged with a renamed.
There are two others bugs affecting this scenario. This patch fix the was where
there is not modification involved except for the flag change. Fixes for the
other bug are coming in later changesets.
Differential Revision: https://phab.mercurial-scm.org/D8531
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 16 May 2020 20:37:56 +0200 |
| parents | 61f2008cd6bf |
| children |
line wrap: on
line source
" $Id: CVSAnnotate.vim,v 1.5 2002/10/01 21:34:02 rhiestan Exp $ " Vim syntax file " Language: CVS annotate output " Maintainer: Bob Hiestand <bob@hiestandfamily.org> " Last Change: $Date: 2002/10/01 21:34:02 $ " Remark: Used by the cvscommand plugin. Originally written by Mathieu " Clabaut if version < 600 syntax clear elseif exists("b:current_syntax") finish endif syn match cvsDate /\S\S\S \S\+ \d\+ \d\+:\d\+:\d\+ \d\+ [+-]\?\d\+/ contained syn match cvsName /^\s*\S\+ / contained nextgroup=cvsVer syn match cvsVer /\d\+ / contained nextgroup=cvsDate syn region cvsHead start="^" end=":" contains=cvsVer,cvsName,cvsDate if !exists("did_cvsannotate_syntax_inits") let did_cvsannotate_syntax_inits = 1 hi link cvsText String hi link cvsDate Comment hi link cvsName Type hi link cvsVer Statement endif let b:current_syntax="CVSAnnotate"