Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

enhance mergeFromZK script so we don't need to specify 2 revision num…

…ber for a single commit patch
  • Loading branch information...
commit 5378974ee838a5d7d6fbe4f91ee676bf19fa80d6 1 parent 024223e
@simonpai simonpai authored
Showing with 8 additions and 3 deletions.
  1. +8 −3 bin/mergeFromZK
View
11 bin/mergeFromZK
@@ -12,15 +12,20 @@
#
maindir="$(pwd)"
-if [ $# != 2 ] ; then
- echo Please specify 2 revisions
+if [ $# != 1 ] ; then
+ echo Please specify 1 or 2 revisions
echo for example
echo ./bin/mergeFromZK 19200 19201
+ echo ./bin/mergeFromZK 19201 \(equivalent to above\)
exit 1
fi
r1=$1
r2=$2
+if [ $# == 1 ]; then
+ r2=$r1
+ r1=$((r2 - 1))
+fi
cd breeze/src/archive/web/breeze
-svn merge https://svn.potix.com/svn/zk1/branches/6.0/zul/src/archive/web -r $1:$2
+svn merge https://svn.potix.com/svn/zk1/branches/6.0/zul/src/archive/web -r $r1:$r2
svn status | grep 'js$' | awk '{print $3}' | xargs svn revert {}
Please sign in to comment.
Something went wrong with that request. Please try again.