| OLD | NEW |
| (Empty) | |
| 1 #!/bin/bash |
| 2 # |
| 3 # A simple script to make it easier to merge in newer versions of sqlite. |
| 4 # It may not work perfectly, in which case, it at least serves as an outline |
| 5 # of the procedure to follow. |
| 6 |
| 7 if [ "$1" = "" ]; then |
| 8 echo "Usage: $0 <Date to pull from CVS> [<merge tool>]" |
| 9 echo "Example: $0 '2007/01/24 09:54:56'" |
| 10 exit 1 |
| 11 fi |
| 12 |
| 13 if [ "$2" = "" ]; then |
| 14 MERGE="kdiff3 -m" |
| 15 fi |
| 16 |
| 17 BASE_DATE=`cat VERSION_DATE` |
| 18 NEW_DATE="$1" |
| 19 |
| 20 cd .. |
| 21 echo "_____ Logging in to sqlite.org cvs (log in as anonymous)..." |
| 22 cvs -d :pserver:anonymous@www.sqlite.org:/sqlite login |
| 23 cvs -d :pserver:anonymous@www.sqlite.org:/sqlite checkout -P -D "$BASE_DATE" -d
sqlite-base sqlite |
| 24 cvs -d :pserver:anonymous@www.sqlite.org:/sqlite checkout -P -D "$NEW_DATE" -d s
qlite-latest sqlite |
| 25 |
| 26 echo "_____ Running merge tool..." |
| 27 $MERGE sqlite-base sqlite-latest sqlite |
| 28 |
| 29 cd sqlite |
| 30 |
| 31 echo "_____ Updating VERSION_DATE to be $NEW_DATE ..." |
| 32 echo $NEW_DATE > VERSION_DATE |
| 33 |
| 34 echo "_____ Processing generated files..." |
| 35 ./google_generate_preprocessed.sh |
| OLD | NEW |