2007-04-05 05:10:37 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
2007-09-25 01:50:05 +00:00
|
|
|
export DEV=/projects/metasploit/framework3/trunk/
|
|
|
|
export SBL=/projects/metasploit/framework3/tags/framework-3.0/
|
2007-04-05 05:10:37 +00:00
|
|
|
export FIL=$1
|
|
|
|
|
|
|
|
echo "[*] Gathering svn information..."
|
|
|
|
TMP=`tempfile mergeXXXXXXX`
|
2007-06-16 02:46:40 +00:00
|
|
|
svn log --limit 1 "${DEV}${FIL}" | egrep -v '^r[0-9]+|^--|^$' > $TMP
|
2007-04-05 05:10:37 +00:00
|
|
|
|
|
|
|
echo "[*] Copying file ${FIL}..."
|
|
|
|
cp ${DEV}${FIL} ${SBL}${FIL}
|
|
|
|
|
|
|
|
echo "[*] Merging file ${FIL}..."
|
2007-06-16 02:46:40 +00:00
|
|
|
svn add ${SBL}${FIL} >/dev/null 2>&1
|
2007-04-05 05:10:37 +00:00
|
|
|
svn commit --non-interactive -F $TMP ${SBL}${FIL}
|
|
|
|
|
|
|
|
rm -f $TMP
|