Browse files

Updated for git

  • Loading branch information...
1 parent d745318 commit 7c8111ba8511bd231eb8cdc16a23e2ecd3d7dc69 @bharat bharat committed May 27, 2009
Showing with 15 additions and 9 deletions.
  1. +2 −1 ui.jquery/README
  2. +11 −7 ui.themeroller/README
  3. +2 −1 ui.themeroller/refresh_modified.sh
View
3 ui.jquery/README
@@ -12,4 +12,5 @@ UPDATING
* Check all the various boxes, Download
* Unpack it into upstream and delete all files except for the .min.js file
* Run refresh_modified.sh
-* svn cp modified/jquery-ui.js file to gallery3/trunk/lib/jquery-ui.js
+* cp modified/jquery-ui.js file to gallery3/trunk/lib/jquery-ui.js
+* git commit / push
View
18 ui.themeroller/README
@@ -17,11 +17,15 @@ UPDATING
$ svn commit upstream
$ sh refresh_modified.sh
-$ svn st modified
- # Make sure that the changes that appear here look reasonable
- # Any files marked with ! or ? need to be resolved (they're
- # deleted and newly added files, respectively). If you don't
- # want to add more new files to svn, update refresh_modified.sh.
+$ git status modified
+ # Examine what's in modified and make sure that we only add files
+ # here that we want to go into Gallery3. Anything that we don't
+ # want should get added to the filters in refresh_modified.sh and
+ # run it again.
+$ git commit -m "Updated ui.jquery to version <VERSION_NUMBER>"
+$ git format-patch --stdout HEAD~1 | patch -d ../../gallery3/lib/themeroller -p3
+$ git push
-$ cd gallery3
-$ svn merge -cREV vendor/ui.themeroller/modified trunk/lib/themeroller
+$ cd ../../gallery3
+$ git commit -m "Updated ui.jquery to version <VERSION_NUMBER>" lib/themeroller
+$ git push
View
3 ui.themeroller/refresh_modified.sh
@@ -1,4 +1,5 @@
-find modified -name .svn -prune -o -type f -print0 | xargs -0 rm
+rm -rf modified
+mkdir modified
cp /dev/null modified/ui.base.css
for css in core theme datepicker dialog progressbar resizable tabs; do
unzip -q -o -j upstream/jquery-ui-themeroller.zip -d modified jquery-ui-themeroller/theme/ui.$css.css

0 comments on commit 7c8111b

Please sign in to comment.