[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r19082 - trunk/contrib/hook-scripts

From: Justin Erenkrantz <justin_at_erenkrantz.com>
Date: 2006-03-29 05:02:42 CEST

On 3/28/06, danderson@tigris.org <danderson@tigris.org> wrote:
> Author: danderson
> Date: Tue Mar 28 18:27:10 2006
> New Revision: 19082
>
> Added:
> trunk/contrib/hook-scripts/detect-merge-conflicts.sh (contents, props changed)
>
> Log:
> Add a contrib pre-commit hook script that aborts the commit if it
> finds things that look like merge conflict markers in the commit diff.

My concern with this pre-commit hook is that it'd not allow itself to
be committed. =P

Just in case people wanted to install it on svn.collab.net... -- justin

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 29 05:02:58 2006

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.