Fixed bugs, cleaned up some code

2007-07-09 00:28:38 +00:00
parent afb445957d
commit bc2fbabc12
6 changed files with 74 additions and 57 deletions
--- a/scripts/nix-restorerevision.sh
+++ b/scripts/nix-restorerevision.sh
@@ -10,6 +10,4 @@ if [ "$#" != 4 ] ; then
  exit 1;
 fi

-cd $statepath
-$svnbin merge -r HEAD:$torevision $repos
-cd -
+$svnbin merge -r HEAD:$torevision $repos $statepath
--- a/scripts/nix-restorerevision.sh.in
+++ b/scripts/nix-restorerevision.sh.in
@@ -10,6 +10,4 @@ if [ "$#" != 4 ] ; then
  exit 1;
 fi

-cd $statepath
-$svnbin merge -r HEAD:$torevision $repos
-cd -
+$svnbin merge -r HEAD:$torevision $repos $statepath