##// END OF EJS Templates
push: add a way to allow concurrent pushes on unrelated heads...
push: add a way to allow concurrent pushes on unrelated heads Client has a mechanism for the server to check that nothing changed server side since the client prepared a push. That check is wide and any head changed on the server will lead to an aborted push. We introduce a way for the client to send a less strict checking. That logic will check that no heads impacted by the push have been affected. If other unrelated heads (including named branches heads) have been affected, the push will proceed. This is very helpful for repositories with high developers traffic on different heads, a common setup. That behavior is currently controlled by an experimental option. The config should live in the "server" section but bike-shedding of the name will happen in the next changesets. Servers advertise this capability through a new bundle2 capability 'checkeads', using the value 'related'. The 'test-push-race.t' is updated to check that new capabilities on the documented cases.

File last commit:

r2591:61f2008c default
r32709:16ada4cb default
Show More
HGAnnotate.vim
27 lines | 859 B | text/x-vim | VimLexer
" $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"