Mercurial > hg-stable
view contrib/vim/HGAnnotate.vim @ 16708:4a02cf4fbb2e
merge: respect bookmarks during merge
Bookmarks will behave more like named branches when merge tries to pick
a revision to merge.
Bookmarks now to respect the current bookmarks. Bookmarks will not
accidentally merged with unnamed heads or other bookmarks. However merge
can pick heads with diverging bookmarks and pick those automatically.
We end up with two cases for picking a revision to merge:
(1) In case of an current bookmark, merge can pick a branch head that has a
diverged bookmark
(2) In case of no current bookmark, merge can pick a branch head that does not
have a bookmark.
| author | David Soria Parra <dsp@php.net> |
|---|---|
| date | Sun, 13 May 2012 11:55:42 +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"