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

Re: [PATCH][detect-merge-conflicts.sh] regex inccomplete

From: David Glasser <glasser_at_mit.edu>
Date: 2007-02-18 19:05:22 CET

On 2/14/07, Mark Garboden <emailit2me2@gmail.com> wrote:
> The regular expression in detect-merge-conflicts.sh misses a few cases.
>
> I believe the following regex is complete. Or at least, more complete.
> '^\+(<{7}|={7}|>{7})(\ \.mine|\ \.r[0-9]+)?$'

Mark,

You put [PATCH] in the subject line, but I don't see an attached
patch. Did you forget to attach it?

--dave

-- 
David Glasser | glasser_at_mit.edu | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Feb 18 19:05:38 2007

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