OLD | NEW |
| (Empty) |
1 #!/bin/bash | |
2 | |
3 # NOTICE: sqlite is no longer kept in CVS. It is now stored in fossil, a VCS | |
4 # built on top of sqlite (yay recursion). This script is kept as a reference | |
5 # for how to manually do the merge. | |
6 | |
7 head -n 5 "$0" | |
8 exit 1 | |
9 | |
10 # A simple script to make it easier to merge in newer versions of sqlite. | |
11 # It may not work perfectly, in which case, it at least serves as an outline | |
12 # of the procedure to follow. | |
13 | |
14 if [ "$1" = "" ]; then | |
15 echo "Usage: $0 <Date to pull from CVS> [<merge tool>]" | |
16 echo "Example: $0 '2007/01/24 09:54:56'" | |
17 exit 1 | |
18 fi | |
19 | |
20 if [ ! -f VERSION_DATE ]; then | |
21 echo "You must run this script in the sqlite directory, i.e.:" | |
22 echo "\$ ./google_update_sqlite.sh" | |
23 exit 1 | |
24 fi | |
25 | |
26 if [ "$2" = "" ]; then | |
27 MERGE="kdiff3 -m" | |
28 fi | |
29 | |
30 BASE_DATE=`cat VERSION_DATE` | |
31 NEW_DATE="$1" | |
32 | |
33 cd .. | |
34 echo "_____ Logging in to sqlite.org CVS (log in as anonymous)..." | |
35 cvs -d :pserver:anonymous@www.sqlite.org:/sqlite login | |
36 cvs -d :pserver:anonymous@www.sqlite.org:/sqlite checkout -P -D "$BASE_DATE" -d
sqlite-base sqlite | |
37 cvs -d :pserver:anonymous@www.sqlite.org:/sqlite checkout -P -D "$NEW_DATE" -d s
qlite-latest sqlite | |
38 | |
39 echo "_____ Removing CVS directories..." | |
40 find sqlite-base -type d -name CVS -execdir rm -rf {} + -prune | |
41 find sqlite-latest -type d -name CVS -execdir rm -rf {} + -prune | |
42 | |
43 echo "_____ Running merge tool..." | |
44 $MERGE sqlite-base sqlite-latest sqlite | |
45 | |
46 cd sqlite | |
47 | |
48 echo "_____ Updating VERSION_DATE to be $NEW_DATE ..." | |
49 echo $NEW_DATE > VERSION_DATE | |
50 | |
51 echo "_____ Processing generated files..." | |
52 ./google_generate_preprocessed.sh | |
OLD | NEW |