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

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

From: Mark Garboden <emailit2me2_at_gmail.com>
Date: 2007-02-14 19:21:38 CET

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]+)?$'

I grabbed an example of a conflict from the svn book and added a few cases.

grep -E '^(<{7}|={7}|>{7})(\ \.mine|\ \.r[0-9]+)?$' << EOF
Top piece of bread
Mayonnaise
Lettuce
Tomato
Provolone
<<<<<<< .mine
Salami
Mortadella
Prosciutto
=======
Sauerkraut
Grilled Chicken
>>>>>>> .r2
Creole Mustard
The three lines above here should be caught
No lines below here should be caught!!!!!!!!!!!!!!!!
==================
=======<
=======z
>>>>>>><
>>>>>>> .really cool
>>>>>>> .r2d2
<<<<<<< .mine mine mine
Bottom piece of bread
EOF

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Feb 17 11:17:41 2007

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