Sample merge script

git-svn-id: file:///home/svn/framework3/trunk@4656 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-05 05:10:37 +00:00 · 2007-04-05 05:10:37 +00:00 · 65c7b9eb21
parent 47a5303ca4
commit 65c7b9eb21
1 changed files with 17 additions and 0 deletions
--- a/dev/merge.sh
+++ b/dev/merge.sh
@ -0,0 +1,17 @@
+#!/bin/sh
+
+export DEV=/msf3/
+export SBL=/projects/metasploit/framework3/tags/framework-3.0/
+export FIL=$1
+
+echo "[*] Gathering svn information..."
+TMP=`tempfile mergeXXXXXXX`
+svn log --limit 1 "${DEV}${FIL}" > $TMP
+
+echo "[*] Copying file ${FIL}..."
+cp ${DEV}${FIL} ${SBL}${FIL}
+
+echo "[*] Merging file ${FIL}..."
+svn commit --non-interactive -F $TMP ${SBL}${FIL}
+
+rm -f $TMP