Start tracking svnmerge info when we create a branch

I thought it was tracked by default

archrelease

@@ -1,19 +1,29 @@
 #!/bin/bash
 
 if [ "$1" = "" ]; then
-	echo "Usage: archrelease <repo>"
-	exit 1
+    echo "Usage: archrelease <repo>"
+    exit 1
 fi
 
 if [ ! -d ../repos/$1 ]; then
-	pushd ..
-	svn copy trunk ../repos/$1
-	popd
+    pushd ..
+    svn copy -r HEAD trunk repos/$1
+    svn commit -m "archrelease: new repo $1"
+    pushd repos/$1
+    svnmerge init
+    svn commit -F svnmerge-commit-message.txt
+    rm svnmerge-commit-message.txt
+    popd
+    popd
 else
-	svnmerge merge ../repos/$1
+    svnmerge merge ../repos/$1
+    pushd ..
+    if [ -f trunk/svnmerge-commit-message.txt ]; then
+        svn commit -F trunk/svnmerge-commit-message.txt
+        rm trunk/svnmerge-commit-message.txt
+    else
+        echo "Nothing to commit"
+    fi
+    popd
 fi
 
-pushd ..
-svn commit -F trunk/svnmerge-commit-message.txt
-popd
-rm svnmerge-commit-message.txt

extrapkg

@@ -20,6 +20,16 @@ if [ ! -f PKGBUILD ]; then
     exit 1
 fi
 
+# define staging areas based on architecture
+if [ "$CARCH" = "i686" ]; then
+    suffix=''
+elif [ "$CARCH" = "x86_64" ]; then
+    suffix='64'
+else
+    echo "CARCH must be set to a recognized value!"
+    exit 1
+fi
+
 source PKGBUILD
 pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
 oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz