From 8c91fce2e146254165485d0b82be4cd6f953aef9 Mon Sep 17 00:00:00 2001
From: timlinux <timlinux@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Mon, 19 May 2008 13:03:31 +0000
Subject: [PATCH] Added a small script to tidy away tmp, orig and rej files
 left by svn

git-svn-id: http://svn.osgeo.org/qgis/trunk@8458 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 scripts/remove_svn_conflict_files.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100755 scripts/remove_svn_conflict_files.sh

diff --git a/scripts/remove_svn_conflict_files.sh b/scripts/remove_svn_conflict_files.sh
new file mode 100755
index 00000000000..e9394af8a53
--- /dev/null
+++ b/scripts/remove_svn_conflict_files.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+#
+# A simple script to get rid of .orig and .rej files left in 
+# your repository by svn. It will request confirmation before 
+# deleting each file.
+#
+# Tim Sutton, May 2008
+
+for FILE in `find . -name *.orig`; do echo "Deleting reject:  $FILE"; rm -i $FILE; done
+for FILE in `find . -name *.rej`; do echo "Deleting reject:  $FILE"; rm -i $FILE; done
+for FILE in `find . -name *.tmp | grep -v "\.svn"`; do echo "Deleting reject:  $FILE"; rm -i $FILE; done