Sample merge script
git-svn-id: file:///home/svn/framework3/trunk@4656 4d416f70-5f16-0410-b530-b9f4589650daunstable
parent
47a5303ca4
commit
65c7b9eb21
|
@ -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
|
Loading…
Reference in New Issue