Fossil SCM

When merging in a change where a file was deleted in the change, actually remove the file from the working checkout. Update the test cases to verify this is what happens.

drh 2010-12-11 20:08 trunk
Commit 70744b76e641d6b9d3ed986bec5af00bf255998d
Parent 9d723c57ea646bf…
3 files changed +21 -46 +73 +49 -58
~ src/merge.c ~ test/merge5.test ~ test/merge5_repo.sql
M src/merge.c
+21 -46
--- src/merge.c
+++ src/merge.c
@@ -51,11 +51,11 @@
5151
 ** --nochange | -n Dryrun: do not actually make any changes; just
5252
 ** show what would have happened.
5353
 */
5454
 void merge_cmd(void){
5555
 int vid; /* Current version */
56
- int mid; /* Version we are merging against */
56
+ int mid; /* Version we are merging from */
5757
 int pid; /* The pivot version - most recent common ancestor */
5858
 int detailFlag; /* True if the --detail option is present */
5959
 int pickFlag; /* True if the --cherrypick option is present */
6060
 int backoutFlag; /* True if the --backout option is present */
6161
 int nochangeFlag; /* True if the --nochange or -n option is present */
@@ -131,56 +131,26 @@
131131
 " chnged BOOLEAN," /* True if current version has been edited */
132132
 " ridv INTEGER," /* Record ID for current version */
133133
 " ridp INTEGER," /* Record ID for pivot */
134134
 " ridm INTEGER" /* Record ID for merge */
135135
 ");"
136
+ );
137
+ db_multi_exec(
136138
 "INSERT OR IGNORE INTO fv"
137
- " SELECT pathname, 0, 0, 0, 0, 0, 0, 0 FROM vfile"
138
- );
139
- db_prepare(&q,
140
- "SELECT id, pathname, rid FROM vfile"
141
- " WHERE vid=%d", pid
142
- );
143
- while( db_step(&q)==SQLITE_ROW ){
144
- int id = db_column_int(&q, 0);
145
- const char *fn = db_column_text(&q, 1);
146
- int rid = db_column_int(&q, 2);
147
- db_multi_exec(
148
- "UPDATE fv SET idp=%d, ridp=%d WHERE fn=%Q",
149
- id, rid, fn
150
- );
151
- }
152
- db_finalize(&q);
153
- db_prepare(&q,
154
- "SELECT id, pathname, rid FROM vfile"
155
- " WHERE vid=%d", mid
156
- );
157
- while( db_step(&q)==SQLITE_ROW ){
158
- int id = db_column_int(&q, 0);
159
- const char *fn = db_column_text(&q, 1);
160
- int rid = db_column_int(&q, 2);
161
- db_multi_exec(
162
- "UPDATE fv SET idm=%d, ridm=%d WHERE fn=%Q",
163
- id, rid, fn
164
- );
165
- }
166
- db_finalize(&q);
167
- db_prepare(&q,
168
- "SELECT id, pathname, rid, chnged FROM vfile"
169
- " WHERE vid=%d", vid
170
- );
171
- while( db_step(&q)==SQLITE_ROW ){
172
- int id = db_column_int(&q, 0);
173
- const char *fn = db_column_text(&q, 1);
174
- int rid = db_column_int(&q, 2);
175
- int chnged = db_column_int(&q, 3);
176
- db_multi_exec(
177
- "UPDATE fv SET idv=%d, ridv=%d, chnged=%d WHERE fn=%Q",
178
- id, rid, chnged, fn
179
- );
180
- }
181
- db_finalize(&q);
139
+ " SELECT pathname, 0, 0, 0, 0, 0, 0, 0 FROM vfile WHERE vid IN (%d,%d,%d);",
140
+ pid, vid, mid
141
+ );
142
+ db_multi_exec(
143
+ "UPDATE fv SET"
144
+ " idp=coalesce((SELECT id FROM vfile WHERE vid=%d AND pathname=fn),0),"
145
+ " ridp=coalesce((SELECT rid FROM vfile WHERE vid=%d AND pathname=fn),0),"
146
+ " idm=coalesce((SELECT id FROM vfile WHERE vid=%d AND pathname=fn),0),"
147
+ " ridm=coalesce((SELECT rid FROM vfile WHERE vid=%d AND pathname=fn),0),"
148
+ " idv=coalesce((SELECT id FROM vfile WHERE vid=%d AND pathname=fn),0),"
149
+ " ridv=coalesce((SELECT rid FROM vfile WHERE vid=%d AND pathname=fn),0)",
150
+ pid, pid, mid, mid, vid, vid
151
+ );
182152
183153
 /*
184154
 ** Find files in mid and vid but not in pid and report conflicts.
185155
 ** The file in mid will be ignored. It will be treated as if it
186156
 ** does not exist.
@@ -319,10 +289,15 @@
319289
 printf("DELETE %s\n", zName);
320290
 undo_save(zName);
321291
 db_multi_exec(
322292
 "UPDATE vfile SET deleted=1 WHERE id=%d", idv
323293
 );
294
+ if( !nochangeFlag ){
295
+ char *zFullPath = mprintf("%s%s", g.zLocalRoot, zName);
296
+ unlink(zFullPath);
297
+ free(zFullPath);
298
+ }
324299
 free(zName);
325300
 }
326301
 db_finalize(&q);
327302
328303
 /*
329304
--- src/merge.c
+++ src/merge.c
@@ -51,11 +51,11 @@
51 ** --nochange | -n Dryrun: do not actually make any changes; just
52 ** show what would have happened.
53 */
54 void merge_cmd(void){
55 int vid; /* Current version */
56 int mid; /* Version we are merging against */
57 int pid; /* The pivot version - most recent common ancestor */
58 int detailFlag; /* True if the --detail option is present */
59 int pickFlag; /* True if the --cherrypick option is present */
60 int backoutFlag; /* True if the --backout option is present */
61 int nochangeFlag; /* True if the --nochange or -n option is present */
@@ -131,56 +131,26 @@
131 " chnged BOOLEAN," /* True if current version has been edited */
132 " ridv INTEGER," /* Record ID for current version */
133 " ridp INTEGER," /* Record ID for pivot */
134 " ridm INTEGER" /* Record ID for merge */
135 ");"
 
 
136 "INSERT OR IGNORE INTO fv"
137 " SELECT pathname, 0, 0, 0, 0, 0, 0, 0 FROM vfile"
138 );
139 db_prepare(&q,
140 "SELECT id, pathname, rid FROM vfile"
141 " WHERE vid=%d", pid
142 );
143 while( db_step(&q)==SQLITE_ROW ){
144 int id = db_column_int(&q, 0);
145 const char *fn = db_column_text(&q, 1);
146 int rid = db_column_int(&q, 2);
147 db_multi_exec(
148 "UPDATE fv SET idp=%d, ridp=%d WHERE fn=%Q",
149 id, rid, fn
150 );
151 }
152 db_finalize(&q);
153 db_prepare(&q,
154 "SELECT id, pathname, rid FROM vfile"
155 " WHERE vid=%d", mid
156 );
157 while( db_step(&q)==SQLITE_ROW ){
158 int id = db_column_int(&q, 0);
159 const char *fn = db_column_text(&q, 1);
160 int rid = db_column_int(&q, 2);
161 db_multi_exec(
162 "UPDATE fv SET idm=%d, ridm=%d WHERE fn=%Q",
163 id, rid, fn
164 );
165 }
166 db_finalize(&q);
167 db_prepare(&q,
168 "SELECT id, pathname, rid, chnged FROM vfile"
169 " WHERE vid=%d", vid
170 );
171 while( db_step(&q)==SQLITE_ROW ){
172 int id = db_column_int(&q, 0);
173 const char *fn = db_column_text(&q, 1);
174 int rid = db_column_int(&q, 2);
175 int chnged = db_column_int(&q, 3);
176 db_multi_exec(
177 "UPDATE fv SET idv=%d, ridv=%d, chnged=%d WHERE fn=%Q",
178 id, rid, chnged, fn
179 );
180 }
181 db_finalize(&q);
182
183 /*
184 ** Find files in mid and vid but not in pid and report conflicts.
185 ** The file in mid will be ignored. It will be treated as if it
186 ** does not exist.
@@ -319,10 +289,15 @@
319 printf("DELETE %s\n", zName);
320 undo_save(zName);
321 db_multi_exec(
322 "UPDATE vfile SET deleted=1 WHERE id=%d", idv
323 );
 
 
 
 
 
324 free(zName);
325 }
326 db_finalize(&q);
327
328 /*
329
--- src/merge.c
+++ src/merge.c
@@ -51,11 +51,11 @@
51 ** --nochange | -n Dryrun: do not actually make any changes; just
52 ** show what would have happened.
53 */
54 void merge_cmd(void){
55 int vid; /* Current version */
56 int mid; /* Version we are merging from */
57 int pid; /* The pivot version - most recent common ancestor */
58 int detailFlag; /* True if the --detail option is present */
59 int pickFlag; /* True if the --cherrypick option is present */
60 int backoutFlag; /* True if the --backout option is present */
61 int nochangeFlag; /* True if the --nochange or -n option is present */
@@ -131,56 +131,26 @@
131 " chnged BOOLEAN," /* True if current version has been edited */
132 " ridv INTEGER," /* Record ID for current version */
133 " ridp INTEGER," /* Record ID for pivot */
134 " ridm INTEGER" /* Record ID for merge */
135 ");"
136 );
137 db_multi_exec(
138 "INSERT OR IGNORE INTO fv"
139 " SELECT pathname, 0, 0, 0, 0, 0, 0, 0 FROM vfile WHERE vid IN (%d,%d,%d);",
140 pid, vid, mid
141 );
142 db_multi_exec(
143 "UPDATE fv SET"
144 " idp=coalesce((SELECT id FROM vfile WHERE vid=%d AND pathname=fn),0),"
145 " ridp=coalesce((SELECT rid FROM vfile WHERE vid=%d AND pathname=fn),0),"
146 " idm=coalesce((SELECT id FROM vfile WHERE vid=%d AND pathname=fn),0),"
147 " ridm=coalesce((SELECT rid FROM vfile WHERE vid=%d AND pathname=fn),0),"
148 " idv=coalesce((SELECT id FROM vfile WHERE vid=%d AND pathname=fn),0),"
149 " ridv=coalesce((SELECT rid FROM vfile WHERE vid=%d AND pathname=fn),0)",
150 pid, pid, mid, mid, vid, vid
151 );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
152
153 /*
154 ** Find files in mid and vid but not in pid and report conflicts.
155 ** The file in mid will be ignored. It will be treated as if it
156 ** does not exist.
@@ -319,10 +289,15 @@
289 printf("DELETE %s\n", zName);
290 undo_save(zName);
291 db_multi_exec(
292 "UPDATE vfile SET deleted=1 WHERE id=%d", idv
293 );
294 if( !nochangeFlag ){
295 char *zFullPath = mprintf("%s%s", g.zLocalRoot, zName);
296 unlink(zFullPath);
297 free(zFullPath);
298 }
299 free(zName);
300 }
301 db_finalize(&q);
302
303 /*
304
M test/merge5.test
+73
--- test/merge5.test
+++ test/merge5.test
@@ -123,5 +123,78 @@
123123
 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt
124124
 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
125125
 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
126126
 b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
127127
 }
128
+
129
+# Merge br2 into the trunk. br2 contains some independent change to the
130
+# two.txt file. Verify that these are merge in correctly.
131
+#
132
+fossil update m1
133
+fossil merge br2
134
+checkout-test 80 {
135
+ 8f09bc55a60eb8ca06f10a3b577aafa869b31695 five.txt
136
+ 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt
137
+ 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
138
+ 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
139
+ 68eeee8b843eaea76e33d3911f416b745d0e5e5c two.txt
140
+}
141
+fossil undo
142
+checkout-test 81 {
143
+ 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt
144
+ 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
145
+ 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
146
+ b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
147
+}
148
+
149
+# Now merge trunk into br2. Verify that the same set of changes result.
150
+#
151
+fossil update br2
152
+fossil merge trunk
153
+checkout-test 90 {
154
+ 8f09bc55a60eb8ca06f10a3b577aafa869b31695 five.txt
155
+ 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt
156
+ 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
157
+ 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
158
+ 68eeee8b843eaea76e33d3911f416b745d0e5e5c two.txt
159
+}
160
+fossil undo
161
+checkout-test 91 {
162
+ 8f09bc55a60eb8ca06f10a3b577aafa869b31695 five.txt
163
+ da5c8346496f3421cb58f84b6e59e9531d9d424d one.txt
164
+ ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt
165
+ 85286cb3bc6d9e6f2f586eb5532f6065678f75b9 two.txt
166
+}
167
+
168
+# Starting from chng3, merge in br4. The one file is deleted from br4, so
169
+# the merge should cause the one file to disappear from the checkout.
170
+#
171
+fossil update chng3
172
+checkout-test 100 {
173
+ 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
174
+ 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
175
+ b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
176
+}
177
+fossil merge br4
178
+checkout-test 101 {
179
+ 6e167b139c294bed560e2e30b352361b101e1f39 four.txt
180
+ 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
181
+ b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
182
+}
183
+fossil undo
184
+checkout-test 102 {
185
+ 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
186
+ 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
187
+ b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
188
+}
189
+
190
+# Do the same merge of br4 into chng3, but this time check it in as a new
191
+# branch.
192
+#
193
+fossil update chng3
194
+fossil merge br4
195
+fossil commit -nosign -branch br4-b -m {merge in br4} -tag m2
196
+checkout-test 110 {
197
+ 6e167b139c294bed560e2e30b352361b101e1f39 four.txt
198
+ 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
199
+ b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
200
+}
128201
--- test/merge5.test
+++ test/merge5.test
@@ -123,5 +123,78 @@
123 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt
124 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
125 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
126 b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
127 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
128
--- test/merge5.test
+++ test/merge5.test
@@ -123,5 +123,78 @@
123 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt
124 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
125 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
126 b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
127 }
128
129 # Merge br2 into the trunk. br2 contains some independent change to the
130 # two.txt file. Verify that these are merge in correctly.
131 #
132 fossil update m1
133 fossil merge br2
134 checkout-test 80 {
135 8f09bc55a60eb8ca06f10a3b577aafa869b31695 five.txt
136 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt
137 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
138 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
139 68eeee8b843eaea76e33d3911f416b745d0e5e5c two.txt
140 }
141 fossil undo
142 checkout-test 81 {
143 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt
144 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
145 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
146 b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
147 }
148
149 # Now merge trunk into br2. Verify that the same set of changes result.
150 #
151 fossil update br2
152 fossil merge trunk
153 checkout-test 90 {
154 8f09bc55a60eb8ca06f10a3b577aafa869b31695 five.txt
155 35815cf5804e8933eab64ae34e00bbb381be72c5 four.txt
156 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
157 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
158 68eeee8b843eaea76e33d3911f416b745d0e5e5c two.txt
159 }
160 fossil undo
161 checkout-test 91 {
162 8f09bc55a60eb8ca06f10a3b577aafa869b31695 five.txt
163 da5c8346496f3421cb58f84b6e59e9531d9d424d one.txt
164 ed24d19d726d173f18dbf4a9a0f8514daa3e3ca4 three.txt
165 85286cb3bc6d9e6f2f586eb5532f6065678f75b9 two.txt
166 }
167
168 # Starting from chng3, merge in br4. The one file is deleted from br4, so
169 # the merge should cause the one file to disappear from the checkout.
170 #
171 fossil update chng3
172 checkout-test 100 {
173 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
174 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
175 b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
176 }
177 fossil merge br4
178 checkout-test 101 {
179 6e167b139c294bed560e2e30b352361b101e1f39 four.txt
180 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
181 b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
182 }
183 fossil undo
184 checkout-test 102 {
185 6f525ab779ad66e24474d845c5fb7938be42d50d one.txt
186 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
187 b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
188 }
189
190 # Do the same merge of br4 into chng3, but this time check it in as a new
191 # branch.
192 #
193 fossil update chng3
194 fossil merge br4
195 fossil commit -nosign -branch br4-b -m {merge in br4} -tag m2
196 checkout-test 110 {
197 6e167b139c294bed560e2e30b352361b101e1f39 four.txt
198 64a8a5c7320fccfa4b2e5dfc5fd20a5381a86c5b three.txt
199 b262fee89ed8a27a23a5e09d3917e0bebe22cd24 two.txt
200 }
201
M test/merge5_repo.sql
+49 -58
--- test/merge5_repo.sql
+++ test/merge5_repo.sql
@@ -16,11 +16,11 @@
1616
 INSERT INTO "blob" VALUES(6,3,190,'3bfa21d09f8718adc3195848d57114e1fbf564fe',X'000000BE789C8DCC3B0EC2300C00D03DA7C88E2AF9A32475678E5016C49238B6400206D285DB036261E400EFED2301C2843421AE9816A02595B0C65DAF9BC52CAA89337B2E80AC20CD1364633749CCCAD4A1299AFF24A7F15D003ECB78DEA656875D2FF7FFB77088FD710EC758BA6095590C082BEAECEC4AC58CDEBEA2617801EE253190');
1717
 INSERT INTO "blob" VALUES(7,4,10,'35815cf5804e8933eab64ae34e00bbb381be72c5',X'0000000A789C0BE00AE40AE20AE60AE102000A8C01CD');
1818
 INSERT INTO "blob" VALUES(8,4,364,'341db367709dc7bc5046ab4fda4f7d9423118cba',X'0000016C789C35CE3B4E44310C85E1FEAE221B1864C78F24B4206A84A0413476EC888A918641B07CEE0CA23D3A9FF4DF158B78FB5CC7AFD3CDF9E7BCDD970A0807AC07C467945BE05B94EDA1FC1F0A4947994B3A70F64194E6CA96C409E0EED4D1B3D57931C78FBC9230999D5879E822AE385DFAEAEC9A327208618CE0CAB193F3FB29FF50C6BEE0885635B0D1C21EBED886C1EA821C6694348D2FE8FB7825B57563A8842A084B2DD95AC3AE6DA8A947B63E5BF8C4EDB1E8985348696903A409C3978026AD4B0F4DAA01FB31D7F65422C1AC73A4A3D5BD7CEF07016B16BBB5C9DB4B89D3FBF65A6C7873C33052034A6D94E82CAED85BA4ACED1765FC64F9');
1919
 INSERT INTO "blob" VALUES(9,5,294,'9223b4cad40c0bc997b747fe4eee586559a43815',X'00000126789C8D8E310E83300C45774E91B955243B714860EE11E85275B16322A4AA0C0186DEBEA00E5DD9FEF2FE7B37E300C1A2B38803861EA8F7D40CE62295E73C194FA8E2DB18A1D31C2507A096858A3295A81D398F98B2B0918A07B67CDE769FA7B99DB92AAFE379D1BFF7B9FC8231EC2FF630AF759B5FE7DD77A3756A1EC68D0C3E69424DA20E3460804C259172F15E52F305DF884EE5');
2020
 INSERT INTO "blob" VALUES(10,6,10,'8f09bc55a60eb8ca06f10a3b577aafa869b31695',X'0000000A789C0BE50AE30AE78AE08AE402000B2201E6');
21
-INSERT INTO "blob" VALUES(11,6,426,'3d5bce2e44a6b39205eb514c581aa41d86f48540',X'000001AA789C458FBD4E43310C85F7FB14992B15D971E224AC20668460412C4E6CAB0828D26DF97B7B521062F3393A9F7D7C1144F5E1E08FEF7676FC3C2E972102C216E316F116F339E4F348CB55F80B84EAD0FAC85918ACD721C08E20D47329222E955B27E49627F3BAFF4554F2A8943835764A1147CFD56BEA6CB959CB84DA34C5A41339EE56FB854CA7834D4B64C5428E55BB2769025E33261521A321E9047DBCFE20B1544910E7F98CE02C96A414AC5C1A0B77B55247D13E70B90EDCC6C8C4E45C0069CC973C031BF9A90F0D8A0A3368BEDC048D71F05C904094AA36214F96129644E6B9C3721B367D95FDD8854DE86B3CE9C3D7CB768E6133C5F647C8C19E1FF7F6EF1CD7B7FDD3947741D7DD721FDCA03783593423C3B056B5C6D920B6C6540B2CDF2E847689');
21
+INSERT INTO "blob" VALUES(11,6,426,'3d5bce2e44a6b39205eb514c581aa41d86f48540',X'00000116789C458ECB4A04311444F7F98AAC075BEE23B949DA8DA01F203A832082E471C30C6A2FBA47D1BF37BA7157A7288A23DDBCCC3736B7F6BCF5D3A75E9EBFCEE6D612204C4813E21EFD0C7E266AD78F177C9829C4EC8018C52374C9EA7208182524C9529A8658432B15CD9D9554AB67E12E01902BA4D23D8872D7E4992B538331D46EEE6D23AA320E1CE4C6B1A5CCDDA973181C6BF705CCDEEECA9A977AB43B5B56FAE5EDFB7D1AD1EE064C7F90377D3B2DFADF9CD78FE575E0C1B6F5689E6C57284961887A14A89A628B340C2825E118C020A6F0E0AE7E00A7744B2A');
2222
 INSERT INTO "blob" VALUES(12,7,10,'c6536e40b3d4755ead483c2e0fb2f16ecb751b6a',X'0000000A789C33E032E432E232E632E1020006CC012D');
2323
 INSERT INTO "blob" VALUES(13,7,424,'b95701e0b73e5ebf452a9a7ae00360bf7fd187fd',X'000001A8789C4590414F83310886EFDFAFE879C90C9496B65E359E8DD18BF10285668B3A936F33EABFB753136FBCC003BC5C05317B3A1EF79F17A7CFD3721D22206C316E11EF315F025FC6B8DC84B7839FEBC124F74A8953E3412962D75C474DCA9E9BB74C68CD524C3691BF91A17326F6044A964ACE2E962AF5E830340E64EF5A322ACB444EBBD57FF7B8CD21D8AC44362C34B09A8E244D60D48CC944C8A94B3A431F6F3F482C55124442CE0883C5939482954B6361352FB517D38ECB6DE0D6FB3C8A061740EAD0746460A771B6409DA2C16CF4B1DC85311D4D9AA4E4DEB21924D10AAA0834AD132CF761A3AB1CFA2E6C82AE74D6C7AFD7ED0CC3668AED8F90A3BFEC0FFE9F39ADEF87E7291F82ADBBE5312895341D420637C74AB5CD6F5185E23AC41B2FDF3224768A');
2424
 INSERT INTO "blob" VALUES(14,8,11,'6f525ab779ad66e24474d845c5fb7938be42d50d',X'0000000B789C73E4728AE072E672E172E502000C1801DA');
2525
 INSERT INTO "blob" VALUES(15,8,319,'c19f6ae71a35cddef0d5de3e1e6109c4378c8215',X'000000E0789C0DCA314E04310C05D03EA7C80158E41F27F6646890587A844048681B274E986A4762B6A0E2ECF0EA977FC3B63EC5BED9F56B1C97E3B65F8EFD3AEE6F3FB7708E894027A413F086B292AE00F6C7ED2E7DAC4917CB94185240536C6453C5225AC5A4F9D0A5ABB78EF012A5F65E58788A12B8536DB3900C9EA316E6CEC9E93F8E195EA361641573481EA5D6E900235B422FD49435BC47FFDEC2672469A9CEC98AAEE685672ECD45B28FEA8B590BA99D9FBD3DFC010C0C3CFF');
2626
 INSERT INTO "blob" VALUES(16,9,11,'b262fee89ed8a27a23a5e09d3917e0bebe22cd24',X'0000000B789C73E372E7F288E0F2E4F2E202000C5A01F3');
@@ -36,15 +36,18 @@
3636
 INSERT INTO "blob" VALUES(26,15,372,'b882b17dc56af1e0297bf8a57c9d15050215c64a',X'00000174789C458E414B04310C85EFF32B7A5E1869D23669BD2A9E45D68B78499BD41175166657D47F6F7711841CF2F2DE47DE8D6B8BAC2FF67C3CAC36DD3AF4E067C019600FE97A0CD274E7867775FA3E39CB44B5E69C34418EAD4A2CDC7A25895631030D074A4218C869D9EC0F528C0A451949814387ACB54729E2FB88471509169AC433F475B820C859A2C70094C077128BC20C99B8905055E3DC586B83E9DE51692D050A9DD84368BED49E3C59E85652082DA0FA11B43E3D38EB297266D4D414C427E30E56C2E8D0A1F9D4A7BDDBD54DD6B6B89DAB5B3AEBE3CFC73C56B71B62BE0839DAFBEB6AFF97D3F6B9BE0DF9E8745BA6A7F1463B76C4AC68218D9A1AA216C2D822D4C63CFD0205E667AF');
3737
 INSERT INTO "blob" VALUES(27,16,11,'e09593950837f76e70ca2f8ff2272ae3df0ba017',X'0000000B789CF38EE0F2E1F2E5F2E3F2E702000DB2020C');
3838
 INSERT INTO "blob" VALUES(28,16,341,'9df70ff13b57e70ea2de63f655eb72df7b83121a',X'000000EF789C0DCD3D4E03311040E1DEA7F001089AF17AFE360D52525220040D8A846C8FAD5004A4CD8AE5F86CF99AEFD173B8CDA7D8FD6BBDDCD7EBD2FBF1725FFA77B9F5BDB79F708E09100E980E886F4833F28C80BF4FFE90C69C444B86342113C2E0D273114165312E5CBD8B36F1DA306E71B71ED7BF35BCC4AA9A2A8A37E232B04332A9430B493347028284D43897F01AD5D4B077A326640C5981477611A324FB7A84F7E8CB357C441BD51C9407541D0A669433FBA05C26622E14A6069F1B1FFF019008411F');
3939
 INSERT INTO "blob" VALUES(29,17,11,'5ebb3c9ad50740a7382902657b84a6105c32fc7b',X'0000000B789C73E372E7F2E0F28CE4F2E202000C0101F4');
4040
 INSERT INTO "blob" VALUES(30,17,322,'94bd3e6b45cc15e86cc76ecfd2207fddbb675b15',X'00000142789C3DCE314E44310C04D0FE9F221758643B711C6F0BA246081A441327B696825D69F9121C9F8010F5F8CDF836F97CDB5F3FF6CFCBE1EAE7FEEEDB5D224038201D109F908F588F85B6FB7439FBCDFEB5276FB59AB5C693B19561BDA88CB0DA8B1B35AC2B4165C245F6D3D5FF10286B56869625A4BAC0E8142D8248A87B9E01D601E507FDBFF22BD9CDF2D03E19A44097DC48812A8BB5D22B028F4C31C4B687A4330422301BCB5AF04ED36B8ECAAB436885D63212F6ED31E56985D1EB2A96A22DFA8800CC6C485A88FAF69CE6F5B4BD24556990111A87AECBEEEAB50C5F8EAB308FED1BE1CB587B');
41
+INSERT INTO "blob" VALUES(31,18,11,'85286cb3bc6d9e6f2f586eb5532f6065678f75b9',X'0000000B789C73E372E7F2E0F2E4F28AE402000BA301F4');
42
+INSERT INTO "blob" VALUES(32,18,360,'333c4d56d218735e20565944b50202f24827e3b8',X'00000168789C25CF3D4E43311004E0DEA7F00582BCDE1FAFD382A8118206D1ECDA5E250D91C213E1F83C9476349F34F398D73C6F9FDFDBED929E722D500E500F006F20472A47C4F49CE3FCB31EB6DF2D6B94EE83D9A42CD76145028AA1736B66612ADD11A4F36E2E5F77328D8722097509A40AC35943C965715F9D11669F5469EE643B5DD71DADB927D067AB32A161804E0FB26E259481A6192E1C46FFE876B94FE3AA321C7DC8EC4BA206AB2C67C61A5284A56934F69E5E324EF6B1EA223271ECB5F0DE031AAC604630558294A9A4D76C4B54753F568B8B16F4D5102946AD4EA1BAD27B9ED753FAC80338F6EBB37A31F568AD888A556519A32B78FA037C076278');
4143
 CREATE TABLE delta(
4244
 rid INTEGER PRIMARY KEY,
4345
 srcid INTEGER NOT NULL REFERENCES blob
4446
 );
4547
 INSERT INTO "delta" VALUES(5,8);
48
+INSERT INTO "delta" VALUES(11,32);
4649
 INSERT INTO "delta" VALUES(15,17);
4750
 INSERT INTO "delta" VALUES(17,21);
4851
 INSERT INTO "delta" VALUES(28,30);
4952
 CREATE TABLE rcvfrom(
5053
 rcvid INTEGER PRIMARY KEY,
@@ -68,10 +71,11 @@
6871
 INSERT INTO "rcvfrom" VALUES(13,1,2455542.13353873,NULL,'127.0.0.1');
6972
 INSERT INTO "rcvfrom" VALUES(14,1,2455542.13467894,NULL,NULL);
7073
 INSERT INTO "rcvfrom" VALUES(15,1,2455542.13571911,NULL,NULL);
7174
 INSERT INTO "rcvfrom" VALUES(16,1,2455542.13623403,NULL,NULL);
7275
 INSERT INTO "rcvfrom" VALUES(17,1,2455542.13660848,NULL,NULL);
76
+INSERT INTO "rcvfrom" VALUES(18,1,2455542.19483546,NULL,NULL);
7377
 CREATE TABLE user(
7478
 uid INTEGER PRIMARY KEY,
7579
 login TEXT,
7680
 pw TEXT,
7781
 cap TEXT,
@@ -89,19 +93,19 @@
8993
 CREATE TABLE config(
9094
 name TEXT PRIMARY KEY NOT NULL,
9195
 value CLOB,
9296
 CHECK( typeof(name)='text' AND length(name)>=1 )
9397
 );
94
-INSERT INTO "config" VALUES('content-schema','1');
95
-INSERT INTO "config" VALUES('aux-schema','2010-11-24');
9698
 INSERT INTO "config" VALUES('server-code','48d0adf1afd58dae13c5b70ff7aff208fb8b9f53');
9799
 INSERT INTO "config" VALUES('project-code','8201587e22864f2fe6b8eb623626de6f9f747058');
98100
 INSERT INTO "config" VALUES('autosync','1');
99101
 INSERT INTO "config" VALUES('localauth','0');
100102
 INSERT INTO "config" VALUES('project-name','Test Case 1');
101103
 INSERT INTO "config" VALUES('project-description','Fossil repository for testing');
102104
 INSERT INTO "config" VALUES('index-page','/timeline');
105
+INSERT INTO "config" VALUES('content-schema','1');
106
+INSERT INTO "config" VALUES('aux-schema','2010-11-24');
103107
 CREATE TABLE shun(uuid UNIQUE);
104108
 CREATE TABLE private(rid INTEGER PRIMARY KEY);
105109
 CREATE TABLE reportfmt(
106110
 rn integer primary key,
107111
 owner text,
@@ -135,14 +139,14 @@
135139
 );
136140
 CREATE TABLE filename(
137141
 fnid INTEGER PRIMARY KEY,
138142
 name TEXT UNIQUE
139143
 );
140
-INSERT INTO "filename" VALUES(1,'one.txt');
141
-INSERT INTO "filename" VALUES(2,'three.txt');
142
-INSERT INTO "filename" VALUES(3,'two.txt');
143
-INSERT INTO "filename" VALUES(4,'four.txt');
144
+INSERT INTO "filename" VALUES(1,'four.txt');
145
+INSERT INTO "filename" VALUES(2,'one.txt');
146
+INSERT INTO "filename" VALUES(3,'three.txt');
147
+INSERT INTO "filename" VALUES(4,'two.txt');
144148
 INSERT INTO "filename" VALUES(5,'five.txt');
145149
 INSERT INTO "filename" VALUES(6,'six.txt');
146150
 INSERT INTO "filename" VALUES(7,'two-rename.txt');
147151
 CREATE TABLE mlink(
148152
 mid INTEGER REFERENCES blob,
@@ -149,44 +153,46 @@
149153
 pid INTEGER REFERENCES blob,
150154
 fid INTEGER REFERENCES blob,
151155
 fnid INTEGER REFERENCES filename,
152156
 pfnid INTEGER REFERENCES filename
153157
 );
154
-INSERT INTO "mlink" VALUES(5,0,2,1,0);
155
-INSERT INTO "mlink" VALUES(5,0,3,2,0);
156
-INSERT INTO "mlink" VALUES(5,0,4,3,0);
157
-INSERT INTO "mlink" VALUES(8,0,7,4,0);
158
+INSERT INTO "mlink" VALUES(8,0,7,1,0);
159
+INSERT INTO "mlink" VALUES(5,0,2,2,0);
160
+INSERT INTO "mlink" VALUES(5,0,3,3,0);
161
+INSERT INTO "mlink" VALUES(5,0,4,4,0);
158162
 INSERT INTO "mlink" VALUES(11,0,10,5,0);
159163
 INSERT INTO "mlink" VALUES(13,0,12,6,0);
160
-INSERT INTO "mlink" VALUES(15,2,14,1,0);
161
-INSERT INTO "mlink" VALUES(17,4,16,3,0);
162
-INSERT INTO "mlink" VALUES(21,3,20,2,0);
163
-INSERT INTO "mlink" VALUES(24,0,23,4,0);
164
-INSERT INTO "mlink" VALUES(24,2,0,1,0);
165
-INSERT INTO "mlink" VALUES(26,2,25,1,0);
166
-INSERT INTO "mlink" VALUES(28,3,27,2,0);
167
-INSERT INTO "mlink" VALUES(28,4,4,7,3);
168
-INSERT INTO "mlink" VALUES(28,4,0,3,0);
164
+INSERT INTO "mlink" VALUES(21,3,20,3,0);
165
+INSERT INTO "mlink" VALUES(17,4,16,4,0);
166
+INSERT INTO "mlink" VALUES(15,2,14,2,0);
167
+INSERT INTO "mlink" VALUES(24,0,23,1,0);
168
+INSERT INTO "mlink" VALUES(24,2,0,2,0);
169
+INSERT INTO "mlink" VALUES(26,2,25,2,0);
169170
 INSERT INTO "mlink" VALUES(30,4,29,7,0);
171
+INSERT INTO "mlink" VALUES(28,3,27,3,0);
172
+INSERT INTO "mlink" VALUES(28,4,4,7,4);
173
+INSERT INTO "mlink" VALUES(28,4,0,4,0);
174
+INSERT INTO "mlink" VALUES(32,4,31,4,0);
170175
 CREATE TABLE plink(
171176
 pid INTEGER REFERENCES blob,
172177
 cid INTEGER REFERENCES blob,
173178
 isprim BOOLEAN,
174179
 mtime DATETIME,
175180
 UNIQUE(pid, cid)
176181
 );
177
-INSERT INTO "plink" VALUES(1,5,1,2455542.12638889);
178182
 INSERT INTO "plink" VALUES(5,8,1,2455542.12795139);
183
+INSERT INTO "plink" VALUES(1,5,1,2455542.12638889);
179184
 INSERT INTO "plink" VALUES(5,11,1,2455542.12873843);
180185
 INSERT INTO "plink" VALUES(5,13,1,2455542.1294213);
181
-INSERT INTO "plink" VALUES(5,15,1,2455542.12998843);
186
+INSERT INTO "plink" VALUES(17,21,1,2455542.13335648);
182187
 INSERT INTO "plink" VALUES(15,17,1,2455542.13015046);
183
-INSERT INTO "plink" VALUES(17,21,1,2455542.13335648);
188
+INSERT INTO "plink" VALUES(5,15,1,2455542.12998843);
184189
 INSERT INTO "plink" VALUES(5,24,1,2455542.13467593);
185190
 INSERT INTO "plink" VALUES(5,26,1,2455542.13571759);
186
-INSERT INTO "plink" VALUES(26,28,1,2455542.13622685);
187191
 INSERT INTO "plink" VALUES(28,30,1,2455542.13659722);
192
+INSERT INTO "plink" VALUES(26,28,1,2455542.13622685);
193
+INSERT INTO "plink" VALUES(11,32,1,2455542.19482639);
188194
 CREATE TABLE event(
189195
 type TEXT,
190196
 mtime DATETIME,
191197
 objid INTEGER PRIMARY KEY,
192198
 tagid INTEGER,
@@ -198,21 +204,22 @@
198204
 comment TEXT,
199205
 brief TEXT,
200206
 omtime DATETIME
201207
 );
202208
 INSERT INTO "event" VALUES('ci',2455542.1246875,1,NULL,NULL,NULL,NULL,'drh',NULL,'initial empty check-in',NULL,NULL);
203
-INSERT INTO "event" VALUES('ci',2455542.12638889,5,NULL,NULL,NULL,NULL,'drh',NULL,'add three initial files',NULL,2455542.12638889);
209
+INSERT INTO "event" VALUES('ci',2455542.12638889,5,NULL,NULL,NULL,NULL,'drh',NULL,'add three initial files',NULL,NULL);
204210
 INSERT INTO "event" VALUES('ci',2455542.12795139,8,NULL,NULL,NULL,NULL,'drh',NULL,'add four.txt',NULL,2455542.12795139);
205211
 INSERT INTO "event" VALUES('ci',2455542.12873843,11,NULL,NULL,NULL,NULL,'drh',NULL,'add five.txt',NULL,NULL);
206212
 INSERT INTO "event" VALUES('ci',2455542.1294213,13,NULL,NULL,NULL,NULL,'drh',NULL,'add six.txt',NULL,NULL);
207
-INSERT INTO "event" VALUES('ci',2455542.12998843,15,NULL,NULL,NULL,NULL,'drh',NULL,'changes to one.txt',NULL,2455542.12998843);
208
-INSERT INTO "event" VALUES('ci',2455542.13015046,17,NULL,NULL,NULL,NULL,'drh',NULL,'changes to two.txt',NULL,2455542.13015046);
213
+INSERT INTO "event" VALUES('ci',2455542.12998843,15,NULL,NULL,NULL,NULL,'drh',NULL,'changes to one.txt',NULL,NULL);
214
+INSERT INTO "event" VALUES('ci',2455542.13015046,17,NULL,NULL,NULL,NULL,'drh',NULL,'changes to two.txt',NULL,NULL);
209215
 INSERT INTO "event" VALUES('ci',2455542.13335648,21,NULL,NULL,NULL,NULL,'drh',NULL,'changes to three.txt',NULL,2455542.13335648);
210216
 INSERT INTO "event" VALUES('ci',2455542.13467593,24,NULL,NULL,NULL,NULL,'drh',NULL,'drop one; add new four',NULL,NULL);
211217
 INSERT INTO "event" VALUES('ci',2455542.13571759,26,NULL,NULL,NULL,NULL,'drh',NULL,'change one',NULL,NULL);
212218
 INSERT INTO "event" VALUES('ci',2455542.13622685,28,NULL,NULL,NULL,NULL,'drh',NULL,'edit three; rename two',NULL,NULL);
213219
 INSERT INTO "event" VALUES('ci',2455542.13659722,30,NULL,NULL,NULL,NULL,'drh',NULL,'edit two-rename',NULL,NULL);
220
+INSERT INTO "event" VALUES('ci',2455542.19482639,32,NULL,NULL,NULL,NULL,'drh',NULL,'edit two',NULL,NULL);
214221
 CREATE TABLE phantom(
215222
 rid INTEGER PRIMARY KEY
216223
 );
217224
 CREATE TABLE orphan(
218225
 rid INTEGER PRIMARY KEY,
@@ -249,37 +256,17 @@
249256
 INSERT INTO "unclustered" VALUES(26);
250257
 INSERT INTO "unclustered" VALUES(27);
251258
 INSERT INTO "unclustered" VALUES(28);
252259
 INSERT INTO "unclustered" VALUES(29);
253260
 INSERT INTO "unclustered" VALUES(30);
261
+INSERT INTO "unclustered" VALUES(31);
262
+INSERT INTO "unclustered" VALUES(32);
254263
 CREATE TABLE unsent(
255264
 rid INTEGER PRIMARY KEY
256265
 );
257
-INSERT INTO "unsent" VALUES(2);
258
-INSERT INTO "unsent" VALUES(3);
259
-INSERT INTO "unsent" VALUES(4);
260
-INSERT INTO "unsent" VALUES(5);
261
-INSERT INTO "unsent" VALUES(7);
262
-INSERT INTO "unsent" VALUES(8);
263
-INSERT INTO "unsent" VALUES(10);
264
-INSERT INTO "unsent" VALUES(11);
265
-INSERT INTO "unsent" VALUES(12);
266
-INSERT INTO "unsent" VALUES(13);
267
-INSERT INTO "unsent" VALUES(14);
268
-INSERT INTO "unsent" VALUES(15);
269
-INSERT INTO "unsent" VALUES(16);
270
-INSERT INTO "unsent" VALUES(17);
271
-INSERT INTO "unsent" VALUES(20);
272
-INSERT INTO "unsent" VALUES(21);
273
-INSERT INTO "unsent" VALUES(23);
274
-INSERT INTO "unsent" VALUES(24);
275
-INSERT INTO "unsent" VALUES(25);
276
-INSERT INTO "unsent" VALUES(26);
277
-INSERT INTO "unsent" VALUES(27);
278
-INSERT INTO "unsent" VALUES(28);
279
-INSERT INTO "unsent" VALUES(29);
280
-INSERT INTO "unsent" VALUES(30);
266
+INSERT INTO "unsent" VALUES(31);
267
+INSERT INTO "unsent" VALUES(32);
281268
 CREATE TABLE tag(
282269
 tagid INTEGER PRIMARY KEY,
283270
 tagname TEXT UNIQUE
284271
 );
285272
 INSERT INTO "tag" VALUES(1,'bgcolor');
@@ -311,14 +298,14 @@
311298
 rid INTEGER REFERENCE blob,
312299
 UNIQUE(rid, tagid)
313300
 );
314301
 INSERT INTO "tagxref" VALUES(8,2,1,1,'trunk',2455542.1246875,1);
315302
 INSERT INTO "tagxref" VALUES(10,2,1,1,NULL,2455542.1246875,1);
303
+INSERT INTO "tagxref" VALUES(4,1,6,5,'2010-12-11 15:02:00',2455542.12704861,5);
304
+INSERT INTO "tagxref" VALUES(11,1,6,5,NULL,2455542.12704861,5);
316305
 INSERT INTO "tagxref" VALUES(8,2,0,1,'trunk',2455542.1246875,5);
317306
 INSERT INTO "tagxref" VALUES(10,2,0,1,NULL,2455542.1246875,5);
318
-INSERT INTO "tagxref" VALUES(4,1,6,5,'2010-12-11 15:02:00',2455542.12704861,5);
319
-INSERT INTO "tagxref" VALUES(11,1,6,5,NULL,2455542.12704861,5);
320307
 INSERT INTO "tagxref" VALUES(8,2,9,8,'br1',2455542.1281713,8);
321308
 INSERT INTO "tagxref" VALUES(12,2,9,8,NULL,2455542.1281713,8);
322309
 INSERT INTO "tagxref" VALUES(4,1,9,8,'2010-12-11 15:04:15',2455542.1281713,8);
323310
 INSERT INTO "tagxref" VALUES(10,0,9,8,NULL,2455542.1281713,8);
324311
 INSERT INTO "tagxref" VALUES(8,2,11,11,'br2',2455542.12873843,11);
@@ -327,19 +314,19 @@
327314
 INSERT INTO "tagxref" VALUES(10,0,11,11,NULL,2455542.12873843,11);
328315
 INSERT INTO "tagxref" VALUES(8,2,13,13,'br3',2455542.1294213,13);
329316
 INSERT INTO "tagxref" VALUES(14,2,13,13,NULL,2455542.1294213,13);
330317
 INSERT INTO "tagxref" VALUES(11,0,13,13,NULL,2455542.1294213,13);
331318
 INSERT INTO "tagxref" VALUES(10,0,13,13,NULL,2455542.1294213,13);
332
-INSERT INTO "tagxref" VALUES(8,2,0,1,'trunk',2455542.1246875,15);
333
-INSERT INTO "tagxref" VALUES(10,2,0,1,NULL,2455542.1246875,15);
334
-INSERT INTO "tagxref" VALUES(8,2,0,1,'trunk',2455542.1246875,17);
335
-INSERT INTO "tagxref" VALUES(10,2,0,1,NULL,2455542.1246875,17);
336319
 INSERT INTO "tagxref" VALUES(4,1,18,15,'2010-12-11 15:07:11',2455542.13072917,15);
337320
 INSERT INTO "tagxref" VALUES(15,1,18,15,NULL,2455542.13072917,15);
338321
 INSERT INTO "tagxref" VALUES(4,1,19,17,'2010-12-11 15:07:25',2455542.13090278,17);
339322
 INSERT INTO "tagxref" VALUES(16,1,19,17,NULL,2455542.13090278,17);
323
+INSERT INTO "tagxref" VALUES(8,2,0,1,'trunk',2455542.1246875,15);
324
+INSERT INTO "tagxref" VALUES(8,2,0,1,'trunk',2455542.1246875,17);
340325
 INSERT INTO "tagxref" VALUES(8,2,0,1,'trunk',2455542.1246875,21);
326
+INSERT INTO "tagxref" VALUES(10,2,0,1,NULL,2455542.1246875,15);
327
+INSERT INTO "tagxref" VALUES(10,2,0,1,NULL,2455542.1246875,17);
341328
 INSERT INTO "tagxref" VALUES(10,2,0,1,NULL,2455542.1246875,21);
342329
 INSERT INTO "tagxref" VALUES(4,1,22,21,'2010-12-11 15:12:02',2455542.13353009,21);
343330
 INSERT INTO "tagxref" VALUES(17,1,22,21,NULL,2455542.13353009,21);
344331
 INSERT INTO "tagxref" VALUES(8,2,24,24,'br4',2455542.13467593,24);
345332
 INSERT INTO "tagxref" VALUES(18,2,24,24,NULL,2455542.13467593,24);
@@ -348,13 +335,15 @@
348335
 INSERT INTO "tagxref" VALUES(8,2,26,26,'br5',2455542.13571759,26);
349336
 INSERT INTO "tagxref" VALUES(19,2,26,26,NULL,2455542.13571759,26);
350337
 INSERT INTO "tagxref" VALUES(11,0,26,26,NULL,2455542.13571759,26);
351338
 INSERT INTO "tagxref" VALUES(10,0,26,26,NULL,2455542.13571759,26);
352339
 INSERT INTO "tagxref" VALUES(8,2,0,26,'br5',2455542.13571759,28);
353
-INSERT INTO "tagxref" VALUES(19,2,0,26,NULL,2455542.13571759,28);
354340
 INSERT INTO "tagxref" VALUES(8,2,0,26,'br5',2455542.13571759,30);
341
+INSERT INTO "tagxref" VALUES(19,2,0,26,NULL,2455542.13571759,28);
355342
 INSERT INTO "tagxref" VALUES(19,2,0,26,NULL,2455542.13571759,30);
343
+INSERT INTO "tagxref" VALUES(8,2,0,11,'br2',2455542.12873843,32);
344
+INSERT INTO "tagxref" VALUES(13,2,0,11,NULL,2455542.12873843,32);
356345
 CREATE TABLE backlink(
357346
 target TEXT,
358347
 srctype INT,
359348
 srcid INT,
360349
 mtime TIMESTAMP,
@@ -369,13 +358,15 @@
369358
 filename TEXT,
370359
 comment TEXT,
371360
 user TEXT
372361
 );
373362
 CREATE TABLE ticket(
363
+ -- Do not change any column that begins with tkt_
374364
 tkt_id INTEGER PRIMARY KEY,
375365
 tkt_uuid TEXT UNIQUE,
376366
 tkt_mtime DATE,
367
+ -- Add as many field as required below this line
377368
 type TEXT,
378369
 status TEXT,
379370
 subsystem TEXT,
380371
 priority TEXT,
381372
 severity TEXT,
382373
--- test/merge5_repo.sql
+++ test/merge5_repo.sql
@@ -16,11 +16,11 @@
16 INSERT INTO "blob" VALUES(6,3,190,'3bfa21d09f8718adc3195848d57114e1fbf564fe',X'000000BE789C8DCC3B0EC2300C00D03DA7C88E2AF9A32475678E5016C49238B6400206D285DB036261E400EFED2301C2843421AE9816A02595B0C65DAF9BC52CAA89337B2E80AC20CD1364633749CCCAD4A1299AFF24A7F15D003ECB78DEA656875D2FF7FFB77088FD710EC758BA6095590C082BEAECEC4AC58CDEBEA2617801EE253190');
17 INSERT INTO "blob" VALUES(7,4,10,'35815cf5804e8933eab64ae34e00bbb381be72c5',X'0000000A789C0BE00AE40AE20AE60AE102000A8C01CD');
18 INSERT INTO "blob" VALUES(8,4,364,'341db367709dc7bc5046ab4fda4f7d9423118cba',X'0000016C789C35CE3B4E44310C85E1FEAE221B1864C78F24B4206A84A0413476EC888A918641B07CEE0CA23D3A9FF4DF158B78FB5CC7AFD3CDF9E7BCDD970A0807AC07C467945BE05B94EDA1FC1F0A4947994B3A70F64194E6CA96C409E0EED4D1B3D57931C78FBC9230999D5879E822AE385DFAEAEC9A327208618CE0CAB193F3FB29FF50C6BEE0885635B0D1C21EBED886C1EA821C6694348D2FE8FB7825B57563A8842A084B2DD95AC3AE6DA8A947B63E5BF8C4EDB1E8985348696903A409C3978026AD4B0F4DAA01FB31D7F65422C1AC73A4A3D5BD7CEF07016B16BBB5C9DB4B89D3FBF65A6C7873C33052034A6D94E82CAED85BA4ACED1765FC64F9');
19 INSERT INTO "blob" VALUES(9,5,294,'9223b4cad40c0bc997b747fe4eee586559a43815',X'00000126789C8D8E310E83300C45774E91B955243B714860EE11E85275B16322A4AA0C0186DEBEA00E5DD9FEF2FE7B37E300C1A2B38803861EA8F7D40CE62295E73C194FA8E2DB18A1D31C2507A096858A3295A81D398F98B2B0918A07B67CDE769FA7B99DB92AAFE379D1BFF7B9FC8231EC2FF630AF759B5FE7DD77A3756A1EC68D0C3E69424DA20E3460804C259172F15E52F305DF884EE5');
20 INSERT INTO "blob" VALUES(10,6,10,'8f09bc55a60eb8ca06f10a3b577aafa869b31695',X'0000000A789C0BE50AE30AE78AE08AE402000B2201E6');
21 INSERT INTO "blob" VALUES(11,6,426,'3d5bce2e44a6b39205eb514c581aa41d86f48540',X'000001AA789C458FBD4E43310C85F7FB14992B15D971E224AC20668460412C4E6CAB0828D26DF97B7B521062F3393A9F7D7C1144F5E1E08FEF7676FC3C2E972102C216E316F116F339E4F348CB55F80B84EAD0FAC85918ACD721C08E20D47329222E955B27E49627F3BAFF4554F2A8943835764A1147CFD56BEA6CB959CB84DA34C5A41339EE56FB854CA7834D4B64C5428E55BB2769025E33261521A321E9047DBCFE20B1544910E7F98CE02C96A414AC5C1A0B77B55247D13E70B90EDCC6C8C4E45C0069CC973C031BF9A90F0D8A0A3368BEDC048D71F05C904094AA36214F96129644E6B9C3721B367D95FDD8854DE86B3CE9C3D7CB768E6133C5F647C8C19E1FF7F6EF1CD7B7FDD3947741D7DD721FDCA03783593423C3B056B5C6D920B6C6540B2CDF2E847689');
22 INSERT INTO "blob" VALUES(12,7,10,'c6536e40b3d4755ead483c2e0fb2f16ecb751b6a',X'0000000A789C33E032E432E232E632E1020006CC012D');
23 INSERT INTO "blob" VALUES(13,7,424,'b95701e0b73e5ebf452a9a7ae00360bf7fd187fd',X'000001A8789C4590414F83310886EFDFAFE879C90C9496B65E359E8DD18BF10285668B3A936F33EABFB753136FBCC003BC5C05317B3A1EF79F17A7CFD3721D22206C316E11EF315F025FC6B8DC84B7839FEBC124F74A8953E3412962D75C474DCA9E9BB74C68CD524C3691BF91A17326F6044A964ACE2E962AF5E830340E64EF5A322ACB444EBBD57FF7B8CD21D8AC44362C34B09A8E244D60D48CC944C8A94B3A431F6F3F482C55124442CE0883C5939482954B6361352FB517D38ECB6DE0D6FB3C8A061740EAD0746460A771B6409DA2C16CF4B1DC85311D4D9AA4E4DEB21924D10AAA0834AD132CF761A3AB1CFA2E6C82AE74D6C7AFD7ED0CC3668AED8F90A3BFEC0FFE9F39ADEF87E7291F82ADBBE5312895341D420637C74AB5CD6F5185E23AC41B2FDF3224768A');
24 INSERT INTO "blob" VALUES(14,8,11,'6f525ab779ad66e24474d845c5fb7938be42d50d',X'0000000B789C73E4728AE072E672E172E502000C1801DA');
25 INSERT INTO "blob" VALUES(15,8,319,'c19f6ae71a35cddef0d5de3e1e6109c4378c8215',X'000000E0789C0DCA314E04310C05D03EA7C80158E41F27F6646890587A844048681B274E986A4762B6A0E2ECF0EA977FC3B63EC5BED9F56B1C97E3B65F8EFD3AEE6F3FB7708E894027A413F086B292AE00F6C7ED2E7DAC4917CB94185240536C6453C5225AC5A4F9D0A5ABB78EF012A5F65E58788A12B8536DB3900C9EA316E6CEC9E93F8E195EA361641573481EA5D6E900235B422FD49435BC47FFDEC2672469A9CEC98AAEE685672ECD45B28FEA8B590BA99D9FBD3DFC010C0C3CFF');
26 INSERT INTO "blob" VALUES(16,9,11,'b262fee89ed8a27a23a5e09d3917e0bebe22cd24',X'0000000B789C73E372E7F288E0F2E4F2E202000C5A01F3');
@@ -36,15 +36,18 @@
36 INSERT INTO "blob" VALUES(26,15,372,'b882b17dc56af1e0297bf8a57c9d15050215c64a',X'00000174789C458E414B04310C85EFF32B7A5E1869D23669BD2A9E45D68B78499BD41175166657D47F6F7711841CF2F2DE47DE8D6B8BAC2FF67C3CAC36DD3AF4E067C019600FE97A0CD274E7867775FA3E39CB44B5E69C34418EAD4A2CDC7A25895631030D074A4218C869D9EC0F528C0A451949814387ACB54729E2FB88471509169AC433F475B820C859A2C70094C077128BC20C99B8905055E3DC586B83E9DE51692D050A9DD84368BED49E3C59E85652082DA0FA11B43E3D38EB297266D4D414C427E30E56C2E8D0A1F9D4A7BDDBD54DD6B6B89DAB5B3AEBE3CFC73C56B71B62BE0839DAFBEB6AFF97D3F6B9BE0DF9E8745BA6A7F1463B76C4AC68218D9A1AA216C2D822D4C63CFD0205E667AF');
37 INSERT INTO "blob" VALUES(27,16,11,'e09593950837f76e70ca2f8ff2272ae3df0ba017',X'0000000B789CF38EE0F2E1F2E5F2E3F2E702000DB2020C');
38 INSERT INTO "blob" VALUES(28,16,341,'9df70ff13b57e70ea2de63f655eb72df7b83121a',X'000000EF789C0DCD3D4E03311040E1DEA7F001089AF17AFE360D52525220040D8A846C8FAD5004A4CD8AE5F86CF99AEFD173B8CDA7D8FD6BBDDCD7EBD2FBF1725FFA77B9F5BDB79F708E09100E980E886F4833F28C80BF4FFE90C69C444B86342113C2E0D273114165312E5CBD8B36F1DA306E71B71ED7BF35BCC4AA9A2A8A37E232B04332A9430B493347028284D43897F01AD5D4B077A326640C5981477611A324FB7A84F7E8CB357C441BD51C9407541D0A669433FBA05C26622E14A6069F1B1FFF019008411F');
39 INSERT INTO "blob" VALUES(29,17,11,'5ebb3c9ad50740a7382902657b84a6105c32fc7b',X'0000000B789C73E372E7F2E0F28CE4F2E202000C0101F4');
40 INSERT INTO "blob" VALUES(30,17,322,'94bd3e6b45cc15e86cc76ecfd2207fddbb675b15',X'00000142789C3DCE314E44310C04D0FE9F221758643B711C6F0BA246081A441327B696825D69F9121C9F8010F5F8CDF836F97CDB5F3FF6CFCBE1EAE7FEEEDB5D224038201D109F908F588F85B6FB7439FBCDFEB5276FB59AB5C693B19561BDA88CB0DA8B1B35AC2B4165C245F6D3D5FF10286B56869625A4BAC0E8142D8248A87B9E01D601E507FDBFF22BD9CDF2D03E19A44097DC48812A8BB5D22B028F4C31C4B687A4330422301BCB5AF04ED36B8ECAAB436885D63212F6ED31E56985D1EB2A96A22DFA8800CC6C485A88FAF69CE6F5B4BD24556990111A87AECBEEEAB50C5F8EAB308FED1BE1CB587B');
 
 
41 CREATE TABLE delta(
42 rid INTEGER PRIMARY KEY,
43 srcid INTEGER NOT NULL REFERENCES blob
44 );
45 INSERT INTO "delta" VALUES(5,8);
 
46 INSERT INTO "delta" VALUES(15,17);
47 INSERT INTO "delta" VALUES(17,21);
48 INSERT INTO "delta" VALUES(28,30);
49 CREATE TABLE rcvfrom(
50 rcvid INTEGER PRIMARY KEY,
@@ -68,10 +71,11 @@
68 INSERT INTO "rcvfrom" VALUES(13,1,2455542.13353873,NULL,'127.0.0.1');
69 INSERT INTO "rcvfrom" VALUES(14,1,2455542.13467894,NULL,NULL);
70 INSERT INTO "rcvfrom" VALUES(15,1,2455542.13571911,NULL,NULL);
71 INSERT INTO "rcvfrom" VALUES(16,1,2455542.13623403,NULL,NULL);
72 INSERT INTO "rcvfrom" VALUES(17,1,2455542.13660848,NULL,NULL);
 
73 CREATE TABLE user(
74 uid INTEGER PRIMARY KEY,
75 login TEXT,
76 pw TEXT,
77 cap TEXT,
@@ -89,19 +93,19 @@
89 CREATE TABLE config(
90 name TEXT PRIMARY KEY NOT NULL,
91 value CLOB,
92 CHECK( typeof(name)='text' AND length(name)>=1 )
93 );
94 INSERT INTO "config" VALUES('content-schema','1');
95 INSERT INTO "config" VALUES('aux-schema','2010-11-24');
96 INSERT INTO "config" VALUES('server-code','48d0adf1afd58dae13c5b70ff7aff208fb8b9f53');
97 INSERT INTO "config" VALUES('project-code','8201587e22864f2fe6b8eb623626de6f9f747058');
98 INSERT INTO "config" VALUES('autosync','1');
99 INSERT INTO "config" VALUES('localauth','0');
100 INSERT INTO "config" VALUES('project-name','Test Case 1');
101 INSERT INTO "config" VALUES('project-description','Fossil repository for testing');
102 INSERT INTO "config" VALUES('index-page','/timeline');
 
 
103 CREATE TABLE shun(uuid UNIQUE);
104 CREATE TABLE private(rid INTEGER PRIMARY KEY);
105 CREATE TABLE reportfmt(
106 rn integer primary key,
107 owner text,
@@ -135,14 +139,14 @@
135 );
136 CREATE TABLE filename(
137 fnid INTEGER PRIMARY KEY,
138 name TEXT UNIQUE
139 );
140 INSERT INTO "filename" VALUES(1,'one.txt');
141 INSERT INTO "filename" VALUES(2,'three.txt');
142 INSERT INTO "filename" VALUES(3,'two.txt');
143 INSERT INTO "filename" VALUES(4,'four.txt');
144 INSERT INTO "filename" VALUES(5,'five.txt');
145 INSERT INTO "filename" VALUES(6,'six.txt');
146 INSERT INTO "filename" VALUES(7,'two-rename.txt');
147 CREATE TABLE mlink(
148 mid INTEGER REFERENCES blob,
@@ -149,44 +153,46 @@
149 pid INTEGER REFERENCES blob,
150 fid INTEGER REFERENCES blob,
151 fnid INTEGER REFERENCES filename,
152 pfnid INTEGER REFERENCES filename
153 );
154 INSERT INTO "mlink" VALUES(5,0,2,1,0);
155 INSERT INTO "mlink" VALUES(5,0,3,2,0);
156 INSERT INTO "mlink" VALUES(5,0,4,3,0);
157 INSERT INTO "mlink" VALUES(8,0,7,4,0);
158 INSERT INTO "mlink" VALUES(11,0,10,5,0);
159 INSERT INTO "mlink" VALUES(13,0,12,6,0);
160 INSERT INTO "mlink" VALUES(15,2,14,1,0);
161 INSERT INTO "mlink" VALUES(17,4,16,3,0);
162 INSERT INTO "mlink" VALUES(21,3,20,2,0);
163 INSERT INTO "mlink" VALUES(24,0,23,4,0);
164 INSERT INTO "mlink" VALUES(24,2,0,1,0);
165 INSERT INTO "mlink" VALUES(26,2,25,1,0);
166 INSERT INTO "mlink" VALUES(28,3,27,2,0);
167 INSERT INTO "mlink" VALUES(28,4,4,7,3);
168 INSERT INTO "mlink" VALUES(28,4,0,3,0);
169 INSERT INTO "mlink" VALUES(30,4,29,7,0);
 
 
 
 
170 CREATE TABLE plink(
171 pid INTEGER REFERENCES blob,
172 cid INTEGER REFERENCES blob,
173 isprim BOOLEAN,
174 mtime DATETIME,
175 UNIQUE(pid, cid)
176 );
177 INSERT INTO "plink" VALUES(1,5,1,2455542.12638889);
178 INSERT INTO "plink" VALUES(5,8,1,2455542.12795139);
 
179 INSERT INTO "plink" VALUES(5,11,1,2455542.12873843);
180 INSERT INTO "plink" VALUES(5,13,1,2455542.1294213);
181 INSERT INTO "plink" VALUES(5,15,1,2455542.12998843);
182 INSERT INTO "plink" VALUES(15,17,1,2455542.13015046);
183 INSERT INTO "plink" VALUES(17,21,1,2455542.13335648);
184 INSERT INTO "plink" VALUES(5,24,1,2455542.13467593);
185 INSERT INTO "plink" VALUES(5,26,1,2455542.13571759);
186 INSERT INTO "plink" VALUES(26,28,1,2455542.13622685);
187 INSERT INTO "plink" VALUES(28,30,1,2455542.13659722);
 
 
188 CREATE TABLE event(
189 type TEXT,
190 mtime DATETIME,
191 objid INTEGER PRIMARY KEY,
192 tagid INTEGER,
@@ -198,21 +204,22 @@
198 comment TEXT,
199 brief TEXT,
200 omtime DATETIME
201 );
202 INSERT INTO "event" VALUES('ci',2455542.1246875,1,NULL,NULL,NULL,NULL,'drh',NULL,'initial empty check-in',NULL,NULL);
203 INSERT INTO "event" VALUES('ci',2455542.12638889,5,NULL,NULL,NULL,NULL,'drh',NULL,'add three initial files',NULL,2455542.12638889);
204 INSERT INTO "event" VALUES('ci',2455542.12795139,8,NULL,NULL,NULL,NULL,'drh',NULL,'add four.txt',NULL,2455542.12795139);
205 INSERT INTO "event" VALUES('ci',2455542.12873843,11,NULL,NULL,NULL,NULL,'drh',NULL,'add five.txt',NULL,NULL);
206 INSERT INTO "event" VALUES('ci',2455542.1294213,13,NULL,NULL,NULL,NULL,'drh',NULL,'add six.txt',NULL,NULL);
207 INSERT INTO "event" VALUES('ci',2455542.12998843,15,NULL,NULL,NULL,NULL,'drh',NULL,'changes to one.txt',NULL,2455542.12998843);
208 INSERT INTO "event" VALUES('ci',2455542.13015046,17,NULL,NULL,NULL,NULL,'drh',NULL,'changes to two.txt',NULL,2455542.13015046);
209 INSERT INTO "event" VALUES('ci',2455542.13335648,21,NULL,NULL,NULL,NULL,'drh',NULL,'changes to three.txt',NULL,2455542.13335648);
210 INSERT INTO "event" VALUES('ci',2455542.13467593,24,NULL,NULL,NULL,NULL,'drh',NULL,'drop one; add new four',NULL,NULL);
211 INSERT INTO "event" VALUES('ci',2455542.13571759,26,NULL,NULL,NULL,NULL,'drh',NULL,'change one',NULL,NULL);
212 INSERT INTO "event" VALUES('ci',2455542.13622685,28,NULL,NULL,NULL,NULL,'drh',NULL,'edit three; rename two',NULL,NULL);
213 INSERT INTO "event" VALUES('ci',2455542.13659722,30,NULL,NULL,NULL,NULL,'drh',NULL,'edit two-rename',NULL,NULL);
 
214 CREATE TABLE phantom(
215 rid INTEGER PRIMARY KEY
216 );
217 CREATE TABLE orphan(
218 rid INTEGER PRIMARY KEY,
@@ -249,37 +256,17 @@
249 INSERT INTO "unclustered" VALUES(26);
250 INSERT INTO "unclustered" VALUES(27);
251 INSERT INTO "unclustered" VALUES(28);
252 INSERT INTO "unclustered" VALUES(29);
253 INSERT INTO "unclustered" VALUES(30);
 
 
254 CREATE TABLE unsent(
255 rid INTEGER PRIMARY KEY
256 );
257 INSERT INTO "unsent" VALUES(2);
258 INSERT INTO "unsent" VALUES(3);
259 INSERT INTO "unsent" VALUES(4);
260 INSERT INTO "unsent" VALUES(5);
261 INSERT INTO "unsent" VALUES(7);
262 INSERT INTO "unsent" VALUES(8);
263 INSERT INTO "unsent" VALUES(10);
264 INSERT INTO "unsent" VALUES(11);
265 INSERT INTO "unsent" VALUES(12);
266 INSERT INTO "unsent" VALUES(13);
267 INSERT INTO "unsent" VALUES(14);
268 INSERT INTO "unsent" VALUES(15);
269 INSERT INTO "unsent" VALUES(16);
270 INSERT INTO "unsent" VALUES(17);
271 INSERT INTO "unsent" VALUES(20);
272 INSERT INTO "unsent" VALUES(21);
273 INSERT INTO "unsent" VALUES(23);
274 INSERT INTO "unsent" VALUES(24);
275 INSERT INTO "unsent" VALUES(25);
276 INSERT INTO "unsent" VALUES(26);
277 INSERT INTO "unsent" VALUES(27);
278 INSERT INTO "unsent" VALUES(28);
279 INSERT INTO "unsent" VALUES(29);
280 INSERT INTO "unsent" VALUES(30);
281 CREATE TABLE tag(
282 tagid INTEGER PRIMARY KEY,
283 tagname TEXT UNIQUE
284 );
285 INSERT INTO "tag" VALUES(1,'bgcolor');
@@ -311,14 +298,14 @@
311 rid INTEGER REFERENCE blob,
312 UNIQUE(rid, tagid)
313 );
314 INSERT INTO "tagxref" VALUES(8,2,1,1,'trunk',2455542.1246875,1);
315 INSERT INTO "tagxref" VALUES(10,2,1,1,NULL,2455542.1246875,1);
 
 
316 INSERT INTO "tagxref" VALUES(8,2,0,1,'trunk',2455542.1246875,5);
317 INSERT INTO "tagxref" VALUES(10,2,0,1,NULL,2455542.1246875,5);
318 INSERT INTO "tagxref" VALUES(4,1,6,5,'2010-12-11 15:02:00',2455542.12704861,5);
319 INSERT INTO "tagxref" VALUES(11,1,6,5,NULL,2455542.12704861,5);
320 INSERT INTO "tagxref" VALUES(8,2,9,8,'br1',2455542.1281713,8);
321 INSERT INTO "tagxref" VALUES(12,2,9,8,NULL,2455542.1281713,8);
322 INSERT INTO "tagxref" VALUES(4,1,9,8,'2010-12-11 15:04:15',2455542.1281713,8);
323 INSERT INTO "tagxref" VALUES(10,0,9,8,NULL,2455542.1281713,8);
324 INSERT INTO "tagxref" VALUES(8,2,11,11,'br2',2455542.12873843,11);
@@ -327,19 +314,19 @@
327 INSERT INTO "tagxref" VALUES(10,0,11,11,NULL,2455542.12873843,11);
328 INSERT INTO "tagxref" VALUES(8,2,13,13,'br3',2455542.1294213,13);
329 INSERT INTO "tagxref" VALUES(14,2,13,13,NULL,2455542.1294213,13);
330 INSERT INTO "tagxref" VALUES(11,0,13,13,NULL,2455542.1294213,13);
331 INSERT INTO "tagxref" VALUES(10,0,13,13,NULL,2455542.1294213,13);
332 INSERT INTO "tagxref" VALUES(8,2,0,1,'trunk',2455542.1246875,15);
333 INSERT INTO "tagxref" VALUES(10,2,0,1,NULL,2455542.1246875,15);
334 INSERT INTO "tagxref" VALUES(8,2,0,1,'trunk',2455542.1246875,17);
335 INSERT INTO "tagxref" VALUES(10,2,0,1,NULL,2455542.1246875,17);
336 INSERT INTO "tagxref" VALUES(4,1,18,15,'2010-12-11 15:07:11',2455542.13072917,15);
337 INSERT INTO "tagxref" VALUES(15,1,18,15,NULL,2455542.13072917,15);
338 INSERT INTO "tagxref" VALUES(4,1,19,17,'2010-12-11 15:07:25',2455542.13090278,17);
339 INSERT INTO "tagxref" VALUES(16,1,19,17,NULL,2455542.13090278,17);
 
 
340 INSERT INTO "tagxref" VALUES(8,2,0,1,'trunk',2455542.1246875,21);
 
 
341 INSERT INTO "tagxref" VALUES(10,2,0,1,NULL,2455542.1246875,21);
342 INSERT INTO "tagxref" VALUES(4,1,22,21,'2010-12-11 15:12:02',2455542.13353009,21);
343 INSERT INTO "tagxref" VALUES(17,1,22,21,NULL,2455542.13353009,21);
344 INSERT INTO "tagxref" VALUES(8,2,24,24,'br4',2455542.13467593,24);
345 INSERT INTO "tagxref" VALUES(18,2,24,24,NULL,2455542.13467593,24);
@@ -348,13 +335,15 @@
348 INSERT INTO "tagxref" VALUES(8,2,26,26,'br5',2455542.13571759,26);
349 INSERT INTO "tagxref" VALUES(19,2,26,26,NULL,2455542.13571759,26);
350 INSERT INTO "tagxref" VALUES(11,0,26,26,NULL,2455542.13571759,26);
351 INSERT INTO "tagxref" VALUES(10,0,26,26,NULL,2455542.13571759,26);
352 INSERT INTO "tagxref" VALUES(8,2,0,26,'br5',2455542.13571759,28);
353 INSERT INTO "tagxref" VALUES(19,2,0,26,NULL,2455542.13571759,28);
354 INSERT INTO "tagxref" VALUES(8,2,0,26,'br5',2455542.13571759,30);
 
355 INSERT INTO "tagxref" VALUES(19,2,0,26,NULL,2455542.13571759,30);
 
 
356 CREATE TABLE backlink(
357 target TEXT,
358 srctype INT,
359 srcid INT,
360 mtime TIMESTAMP,
@@ -369,13 +358,15 @@
369 filename TEXT,
370 comment TEXT,
371 user TEXT
372 );
373 CREATE TABLE ticket(
 
374 tkt_id INTEGER PRIMARY KEY,
375 tkt_uuid TEXT UNIQUE,
376 tkt_mtime DATE,
 
377 type TEXT,
378 status TEXT,
379 subsystem TEXT,
380 priority TEXT,
381 severity TEXT,
382
--- test/merge5_repo.sql
+++ test/merge5_repo.sql
@@ -16,11 +16,11 @@
16 INSERT INTO "blob" VALUES(6,3,190,'3bfa21d09f8718adc3195848d57114e1fbf564fe',X'000000BE789C8DCC3B0EC2300C00D03DA7C88E2AF9A32475678E5016C49238B6400206D285DB036261E400EFED2301C2843421AE9816A02595B0C65DAF9BC52CAA89337B2E80AC20CD1364633749CCCAD4A1299AFF24A7F15D003ECB78DEA656875D2FF7FFB77088FD710EC758BA6095590C082BEAECEC4AC58CDEBEA2617801EE253190');
17 INSERT INTO "blob" VALUES(7,4,10,'35815cf5804e8933eab64ae34e00bbb381be72c5',X'0000000A789C0BE00AE40AE20AE60AE102000A8C01CD');
18 INSERT INTO "blob" VALUES(8,4,364,'341db367709dc7bc5046ab4fda4f7d9423118cba',X'0000016C789C35CE3B4E44310C85E1FEAE221B1864C78F24B4206A84A0413476EC888A918641B07CEE0CA23D3A9FF4DF158B78FB5CC7AFD3CDF9E7BCDD970A0807AC07C467945BE05B94EDA1FC1F0A4947994B3A70F64194E6CA96C409E0EED4D1B3D57931C78FBC9230999D5879E822AE385DFAEAEC9A327208618CE0CAB193F3FB29FF50C6BEE0885635B0D1C21EBED886C1EA821C6694348D2FE8FB7825B57563A8842A084B2DD95AC3AE6DA8A947B63E5BF8C4EDB1E8985348696903A409C3978026AD4B0F4DAA01FB31D7F65422C1AC73A4A3D5BD7CEF07016B16BBB5C9DB4B89D3FBF65A6C7873C33052034A6D94E82CAED85BA4ACED1765FC64F9');
19 INSERT INTO "blob" VALUES(9,5,294,'9223b4cad40c0bc997b747fe4eee586559a43815',X'00000126789C8D8E310E83300C45774E91B955243B714860EE11E85275B16322A4AA0C0186DEBEA00E5DD9FEF2FE7B37E300C1A2B38803861EA8F7D40CE62295E73C194FA8E2DB18A1D31C2507A096858A3295A81D398F98B2B0918A07B67CDE769FA7B99DB92AAFE379D1BFF7B9FC8231EC2FF630AF759B5FE7DD77A3756A1EC68D0C3E69424DA20E3460804C259172F15E52F305DF884EE5');
20 INSERT INTO "blob" VALUES(10,6,10,'8f09bc55a60eb8ca06f10a3b577aafa869b31695',X'0000000A789C0BE50AE30AE78AE08AE402000B2201E6');
21 INSERT INTO "blob" VALUES(11,6,426,'3d5bce2e44a6b39205eb514c581aa41d86f48540',X'00000116789C458ECB4A04311444F7F98AAC075BEE23B949DA8DA01F203A832082E471C30C6A2FBA47D1BF37BA7157A7288A23DDBCCC3736B7F6BCF5D3A75E9EBFCEE6D612204C4813E21EFD0C7E266AD78F177C9829C4EC8018C52374C9EA7208182524C9529A8658432B15CD9D9554AB67E12E01902BA4D23D8872D7E4992B538331D46EEE6D23AA320E1CE4C6B1A5CCDDA973181C6BF705CCDEEECA9A977AB43B5B56FAE5EDFB7D1AD1EE064C7F90377D3B2DFADF9CD78FE575E0C1B6F5689E6C57284961887A14A89A628B340C2825E118C020A6F0E0AE7E00A7744B2A');
22 INSERT INTO "blob" VALUES(12,7,10,'c6536e40b3d4755ead483c2e0fb2f16ecb751b6a',X'0000000A789C33E032E432E232E632E1020006CC012D');
23 INSERT INTO "blob" VALUES(13,7,424,'b95701e0b73e5ebf452a9a7ae00360bf7fd187fd',X'000001A8789C4590414F83310886EFDFAFE879C90C9496B65E359E8DD18BF10285668B3A936F33EABFB753136FBCC003BC5C05317B3A1EF79F17A7CFD3721D22206C316E11EF315F025FC6B8DC84B7839FEBC124F74A8953E3412962D75C474DCA9E9BB74C68CD524C3691BF91A17326F6044A964ACE2E962AF5E830340E64EF5A322ACB444EBBD57FF7B8CD21D8AC44362C34B09A8E244D60D48CC944C8A94B3A431F6F3F482C55124442CE0883C5939482954B6361352FB517D38ECB6DE0D6FB3C8A061740EAD0746460A771B6409DA2C16CF4B1DC85311D4D9AA4E4DEB21924D10AAA0834AD132CF761A3AB1CFA2E6C82AE74D6C7AFD7ED0CC3668AED8F90A3BFEC0FFE9F39ADEF87E7291F82ADBBE5312895341D420637C74AB5CD6F5185E23AC41B2FDF3224768A');
24 INSERT INTO "blob" VALUES(14,8,11,'6f525ab779ad66e24474d845c5fb7938be42d50d',X'0000000B789C73E4728AE072E672E172E502000C1801DA');
25 INSERT INTO "blob" VALUES(15,8,319,'c19f6ae71a35cddef0d5de3e1e6109c4378c8215',X'000000E0789C0DCA314E04310C05D03EA7C80158E41F27F6646890587A844048681B274E986A4762B6A0E2ECF0EA977FC3B63EC5BED9F56B1C97E3B65F8EFD3AEE6F3FB7708E894027A413F086B292AE00F6C7ED2E7DAC4917CB94185240536C6453C5225AC5A4F9D0A5ABB78EF012A5F65E58788A12B8536DB3900C9EA316E6CEC9E93F8E195EA361641573481EA5D6E900235B422FD49435BC47FFDEC2672469A9CEC98AAEE685672ECD45B28FEA8B590BA99D9FBD3DFC010C0C3CFF');
26 INSERT INTO "blob" VALUES(16,9,11,'b262fee89ed8a27a23a5e09d3917e0bebe22cd24',X'0000000B789C73E372E7F288E0F2E4F2E202000C5A01F3');
@@ -36,15 +36,18 @@
36 INSERT INTO "blob" VALUES(26,15,372,'b882b17dc56af1e0297bf8a57c9d15050215c64a',X'00000174789C458E414B04310C85EFF32B7A5E1869D23669BD2A9E45D68B78499BD41175166657D47F6F7711841CF2F2DE47DE8D6B8BAC2FF67C3CAC36DD3AF4E067C019600FE97A0CD274E7867775FA3E39CB44B5E69C34418EAD4A2CDC7A25895631030D074A4218C869D9EC0F528C0A451949814387ACB54729E2FB88471509169AC433F475B820C859A2C70094C077128BC20C99B8905055E3DC586B83E9DE51692D050A9DD84368BED49E3C59E85652082DA0FA11B43E3D38EB297266D4D414C427E30E56C2E8D0A1F9D4A7BDDBD54DD6B6B89DAB5B3AEBE3CFC73C56B71B62BE0839DAFBEB6AFF97D3F6B9BE0DF9E8745BA6A7F1463B76C4AC68218D9A1AA216C2D822D4C63CFD0205E667AF');
37 INSERT INTO "blob" VALUES(27,16,11,'e09593950837f76e70ca2f8ff2272ae3df0ba017',X'0000000B789CF38EE0F2E1F2E5F2E3F2E702000DB2020C');
38 INSERT INTO "blob" VALUES(28,16,341,'9df70ff13b57e70ea2de63f655eb72df7b83121a',X'000000EF789C0DCD3D4E03311040E1DEA7F001089AF17AFE360D52525220040D8A846C8FAD5004A4CD8AE5F86CF99AEFD173B8CDA7D8FD6BBDDCD7EBD2FBF1725FFA77B9F5BDB79F708E09100E980E886F4833F28C80BF4FFE90C69C444B86342113C2E0D273114165312E5CBD8B36F1DA306E71B71ED7BF35BCC4AA9A2A8A37E232B04332A9430B493347028284D43897F01AD5D4B077A326640C5981477611A324FB7A84F7E8CB357C441BD51C9407541D0A669433FBA05C26622E14A6069F1B1FFF019008411F');
39 INSERT INTO "blob" VALUES(29,17,11,'5ebb3c9ad50740a7382902657b84a6105c32fc7b',X'0000000B789C73E372E7F2E0F28CE4F2E202000C0101F4');
40 INSERT INTO "blob" VALUES(30,17,322,'94bd3e6b45cc15e86cc76ecfd2207fddbb675b15',X'00000142789C3DCE314E44310C04D0FE9F221758643B711C6F0BA246081A441327B696825D69F9121C9F8010F5F8CDF836F97CDB5F3FF6CFCBE1EAE7FEEEDB5D224038201D109F908F588F85B6FB7439FBCDFEB5276FB59AB5C693B19561BDA88CB0DA8B1B35AC2B4165C245F6D3D5FF10286B56869625A4BAC0E8142D8248A87B9E01D601E507FDBFF22BD9CDF2D03E19A44097DC48812A8BB5D22B028F4C31C4B687A4330422301BCB5AF04ED36B8ECAAB436885D63212F6ED31E56985D1EB2A96A22DFA8800CC6C485A88FAF69CE6F5B4BD24556990111A87AECBEEEAB50C5F8EAB308FED1BE1CB587B');
41 INSERT INTO "blob" VALUES(31,18,11,'85286cb3bc6d9e6f2f586eb5532f6065678f75b9',X'0000000B789C73E372E7F2E0F2E4F28AE402000BA301F4');
42 INSERT INTO "blob" VALUES(32,18,360,'333c4d56d218735e20565944b50202f24827e3b8',X'00000168789C25CF3D4E43311004E0DEA7F00582BCDE1FAFD382A8118206D1ECDA5E250D91C213E1F83C9476349F34F398D73C6F9FDFDBED929E722D500E500F006F20472A47C4F49CE3FCB31EB6DF2D6B94EE83D9A42CD76145028AA1736B66612ADD11A4F36E2E5F77328D8722097509A40AC35943C965715F9D11669F5469EE643B5DD71DADB927D067AB32A161804E0FB26E259481A6192E1C46FFE876B94FE3AA321C7DC8EC4BA206AB2C67C61A5284A56934F69E5E324EF6B1EA223271ECB5F0DE031AAC604630558294A9A4D76C4B54753F568B8B16F4D5102946AD4EA1BAD27B9ED753FAC80338F6EBB37A31F568AD888A556519A32B78FA037C076278');
43 CREATE TABLE delta(
44 rid INTEGER PRIMARY KEY,
45 srcid INTEGER NOT NULL REFERENCES blob
46 );
47 INSERT INTO "delta" VALUES(5,8);
48 INSERT INTO "delta" VALUES(11,32);
49 INSERT INTO "delta" VALUES(15,17);
50 INSERT INTO "delta" VALUES(17,21);
51 INSERT INTO "delta" VALUES(28,30);
52 CREATE TABLE rcvfrom(
53 rcvid INTEGER PRIMARY KEY,
@@ -68,10 +71,11 @@
71 INSERT INTO "rcvfrom" VALUES(13,1,2455542.13353873,NULL,'127.0.0.1');
72 INSERT INTO "rcvfrom" VALUES(14,1,2455542.13467894,NULL,NULL);
73 INSERT INTO "rcvfrom" VALUES(15,1,2455542.13571911,NULL,NULL);
74 INSERT INTO "rcvfrom" VALUES(16,1,2455542.13623403,NULL,NULL);
75 INSERT INTO "rcvfrom" VALUES(17,1,2455542.13660848,NULL,NULL);
76 INSERT INTO "rcvfrom" VALUES(18,1,2455542.19483546,NULL,NULL);
77 CREATE TABLE user(
78 uid INTEGER PRIMARY KEY,
79 login TEXT,
80 pw TEXT,
81 cap TEXT,
@@ -89,19 +93,19 @@
93 CREATE TABLE config(
94 name TEXT PRIMARY KEY NOT NULL,
95 value CLOB,
96 CHECK( typeof(name)='text' AND length(name)>=1 )
97 );
 
 
98 INSERT INTO "config" VALUES('server-code','48d0adf1afd58dae13c5b70ff7aff208fb8b9f53');
99 INSERT INTO "config" VALUES('project-code','8201587e22864f2fe6b8eb623626de6f9f747058');
100 INSERT INTO "config" VALUES('autosync','1');
101 INSERT INTO "config" VALUES('localauth','0');
102 INSERT INTO "config" VALUES('project-name','Test Case 1');
103 INSERT INTO "config" VALUES('project-description','Fossil repository for testing');
104 INSERT INTO "config" VALUES('index-page','/timeline');
105 INSERT INTO "config" VALUES('content-schema','1');
106 INSERT INTO "config" VALUES('aux-schema','2010-11-24');
107 CREATE TABLE shun(uuid UNIQUE);
108 CREATE TABLE private(rid INTEGER PRIMARY KEY);
109 CREATE TABLE reportfmt(
110 rn integer primary key,
111 owner text,
@@ -135,14 +139,14 @@
139 );
140 CREATE TABLE filename(
141 fnid INTEGER PRIMARY KEY,
142 name TEXT UNIQUE
143 );
144 INSERT INTO "filename" VALUES(1,'four.txt');
145 INSERT INTO "filename" VALUES(2,'one.txt');
146 INSERT INTO "filename" VALUES(3,'three.txt');
147 INSERT INTO "filename" VALUES(4,'two.txt');
148 INSERT INTO "filename" VALUES(5,'five.txt');
149 INSERT INTO "filename" VALUES(6,'six.txt');
150 INSERT INTO "filename" VALUES(7,'two-rename.txt');
151 CREATE TABLE mlink(
152 mid INTEGER REFERENCES blob,
@@ -149,44 +153,46 @@
153 pid INTEGER REFERENCES blob,
154 fid INTEGER REFERENCES blob,
155 fnid INTEGER REFERENCES filename,
156 pfnid INTEGER REFERENCES filename
157 );
158 INSERT INTO "mlink" VALUES(8,0,7,1,0);
159 INSERT INTO "mlink" VALUES(5,0,2,2,0);
160 INSERT INTO "mlink" VALUES(5,0,3,3,0);
161 INSERT INTO "mlink" VALUES(5,0,4,4,0);
162 INSERT INTO "mlink" VALUES(11,0,10,5,0);
163 INSERT INTO "mlink" VALUES(13,0,12,6,0);
164 INSERT INTO "mlink" VALUES(21,3,20,3,0);
165 INSERT INTO "mlink" VALUES(17,4,16,4,0);
166 INSERT INTO "mlink" VALUES(15,2,14,2,0);
167 INSERT INTO "mlink" VALUES(24,0,23,1,0);
168 INSERT INTO "mlink" VALUES(24,2,0,2,0);
169 INSERT INTO "mlink" VALUES(26,2,25,2,0);
 
 
 
170 INSERT INTO "mlink" VALUES(30,4,29,7,0);
171 INSERT INTO "mlink" VALUES(28,3,27,3,0);
172 INSERT INTO "mlink" VALUES(28,4,4,7,4);
173 INSERT INTO "mlink" VALUES(28,4,0,4,0);
174 INSERT INTO "mlink" VALUES(32,4,31,4,0);
175 CREATE TABLE plink(
176 pid INTEGER REFERENCES blob,
177 cid INTEGER REFERENCES blob,
178 isprim BOOLEAN,
179 mtime DATETIME,
180 UNIQUE(pid, cid)
181 );
 
182 INSERT INTO "plink" VALUES(5,8,1,2455542.12795139);
183 INSERT INTO "plink" VALUES(1,5,1,2455542.12638889);
184 INSERT INTO "plink" VALUES(5,11,1,2455542.12873843);
185 INSERT INTO "plink" VALUES(5,13,1,2455542.1294213);
186 INSERT INTO "plink" VALUES(17,21,1,2455542.13335648);
187 INSERT INTO "plink" VALUES(15,17,1,2455542.13015046);
188 INSERT INTO "plink" VALUES(5,15,1,2455542.12998843);
189 INSERT INTO "plink" VALUES(5,24,1,2455542.13467593);
190 INSERT INTO "plink" VALUES(5,26,1,2455542.13571759);
 
191 INSERT INTO "plink" VALUES(28,30,1,2455542.13659722);
192 INSERT INTO "plink" VALUES(26,28,1,2455542.13622685);
193 INSERT INTO "plink" VALUES(11,32,1,2455542.19482639);
194 CREATE TABLE event(
195 type TEXT,
196 mtime DATETIME,
197 objid INTEGER PRIMARY KEY,
198 tagid INTEGER,
@@ -198,21 +204,22 @@
204 comment TEXT,
205 brief TEXT,
206 omtime DATETIME
207 );
208 INSERT INTO "event" VALUES('ci',2455542.1246875,1,NULL,NULL,NULL,NULL,'drh',NULL,'initial empty check-in',NULL,NULL);
209 INSERT INTO "event" VALUES('ci',2455542.12638889,5,NULL,NULL,NULL,NULL,'drh',NULL,'add three initial files',NULL,NULL);
210 INSERT INTO "event" VALUES('ci',2455542.12795139,8,NULL,NULL,NULL,NULL,'drh',NULL,'add four.txt',NULL,2455542.12795139);
211 INSERT INTO "event" VALUES('ci',2455542.12873843,11,NULL,NULL,NULL,NULL,'drh',NULL,'add five.txt',NULL,NULL);
212 INSERT INTO "event" VALUES('ci',2455542.1294213,13,NULL,NULL,NULL,NULL,'drh',NULL,'add six.txt',NULL,NULL);
213 INSERT INTO "event" VALUES('ci',2455542.12998843,15,NULL,NULL,NULL,NULL,'drh',NULL,'changes to one.txt',NULL,NULL);
214 INSERT INTO "event" VALUES('ci',2455542.13015046,17,NULL,NULL,NULL,NULL,'drh',NULL,'changes to two.txt',NULL,NULL);
215 INSERT INTO "event" VALUES('ci',2455542.13335648,21,NULL,NULL,NULL,NULL,'drh',NULL,'changes to three.txt',NULL,2455542.13335648);
216 INSERT INTO "event" VALUES('ci',2455542.13467593,24,NULL,NULL,NULL,NULL,'drh',NULL,'drop one; add new four',NULL,NULL);
217 INSERT INTO "event" VALUES('ci',2455542.13571759,26,NULL,NULL,NULL,NULL,'drh',NULL,'change one',NULL,NULL);
218 INSERT INTO "event" VALUES('ci',2455542.13622685,28,NULL,NULL,NULL,NULL,'drh',NULL,'edit three; rename two',NULL,NULL);
219 INSERT INTO "event" VALUES('ci',2455542.13659722,30,NULL,NULL,NULL,NULL,'drh',NULL,'edit two-rename',NULL,NULL);
220 INSERT INTO "event" VALUES('ci',2455542.19482639,32,NULL,NULL,NULL,NULL,'drh',NULL,'edit two',NULL,NULL);
221 CREATE TABLE phantom(
222 rid INTEGER PRIMARY KEY
223 );
224 CREATE TABLE orphan(
225 rid INTEGER PRIMARY KEY,
@@ -249,37 +256,17 @@
256 INSERT INTO "unclustered" VALUES(26);
257 INSERT INTO "unclustered" VALUES(27);
258 INSERT INTO "unclustered" VALUES(28);
259 INSERT INTO "unclustered" VALUES(29);
260 INSERT INTO "unclustered" VALUES(30);
261 INSERT INTO "unclustered" VALUES(31);
262 INSERT INTO "unclustered" VALUES(32);
263 CREATE TABLE unsent(
264 rid INTEGER PRIMARY KEY
265 );
266 INSERT INTO "unsent" VALUES(31);
267 INSERT INTO "unsent" VALUES(32);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
268 CREATE TABLE tag(
269 tagid INTEGER PRIMARY KEY,
270 tagname TEXT UNIQUE
271 );
272 INSERT INTO "tag" VALUES(1,'bgcolor');
@@ -311,14 +298,14 @@
298 rid INTEGER REFERENCE blob,
299 UNIQUE(rid, tagid)
300 );
301 INSERT INTO "tagxref" VALUES(8,2,1,1,'trunk',2455542.1246875,1);
302 INSERT INTO "tagxref" VALUES(10,2,1,1,NULL,2455542.1246875,1);
303 INSERT INTO "tagxref" VALUES(4,1,6,5,'2010-12-11 15:02:00',2455542.12704861,5);
304 INSERT INTO "tagxref" VALUES(11,1,6,5,NULL,2455542.12704861,5);
305 INSERT INTO "tagxref" VALUES(8,2,0,1,'trunk',2455542.1246875,5);
306 INSERT INTO "tagxref" VALUES(10,2,0,1,NULL,2455542.1246875,5);
 
 
307 INSERT INTO "tagxref" VALUES(8,2,9,8,'br1',2455542.1281713,8);
308 INSERT INTO "tagxref" VALUES(12,2,9,8,NULL,2455542.1281713,8);
309 INSERT INTO "tagxref" VALUES(4,1,9,8,'2010-12-11 15:04:15',2455542.1281713,8);
310 INSERT INTO "tagxref" VALUES(10,0,9,8,NULL,2455542.1281713,8);
311 INSERT INTO "tagxref" VALUES(8,2,11,11,'br2',2455542.12873843,11);
@@ -327,19 +314,19 @@
314 INSERT INTO "tagxref" VALUES(10,0,11,11,NULL,2455542.12873843,11);
315 INSERT INTO "tagxref" VALUES(8,2,13,13,'br3',2455542.1294213,13);
316 INSERT INTO "tagxref" VALUES(14,2,13,13,NULL,2455542.1294213,13);
317 INSERT INTO "tagxref" VALUES(11,0,13,13,NULL,2455542.1294213,13);
318 INSERT INTO "tagxref" VALUES(10,0,13,13,NULL,2455542.1294213,13);
 
 
 
 
319 INSERT INTO "tagxref" VALUES(4,1,18,15,'2010-12-11 15:07:11',2455542.13072917,15);
320 INSERT INTO "tagxref" VALUES(15,1,18,15,NULL,2455542.13072917,15);
321 INSERT INTO "tagxref" VALUES(4,1,19,17,'2010-12-11 15:07:25',2455542.13090278,17);
322 INSERT INTO "tagxref" VALUES(16,1,19,17,NULL,2455542.13090278,17);
323 INSERT INTO "tagxref" VALUES(8,2,0,1,'trunk',2455542.1246875,15);
324 INSERT INTO "tagxref" VALUES(8,2,0,1,'trunk',2455542.1246875,17);
325 INSERT INTO "tagxref" VALUES(8,2,0,1,'trunk',2455542.1246875,21);
326 INSERT INTO "tagxref" VALUES(10,2,0,1,NULL,2455542.1246875,15);
327 INSERT INTO "tagxref" VALUES(10,2,0,1,NULL,2455542.1246875,17);
328 INSERT INTO "tagxref" VALUES(10,2,0,1,NULL,2455542.1246875,21);
329 INSERT INTO "tagxref" VALUES(4,1,22,21,'2010-12-11 15:12:02',2455542.13353009,21);
330 INSERT INTO "tagxref" VALUES(17,1,22,21,NULL,2455542.13353009,21);
331 INSERT INTO "tagxref" VALUES(8,2,24,24,'br4',2455542.13467593,24);
332 INSERT INTO "tagxref" VALUES(18,2,24,24,NULL,2455542.13467593,24);
@@ -348,13 +335,15 @@
335 INSERT INTO "tagxref" VALUES(8,2,26,26,'br5',2455542.13571759,26);
336 INSERT INTO "tagxref" VALUES(19,2,26,26,NULL,2455542.13571759,26);
337 INSERT INTO "tagxref" VALUES(11,0,26,26,NULL,2455542.13571759,26);
338 INSERT INTO "tagxref" VALUES(10,0,26,26,NULL,2455542.13571759,26);
339 INSERT INTO "tagxref" VALUES(8,2,0,26,'br5',2455542.13571759,28);
 
340 INSERT INTO "tagxref" VALUES(8,2,0,26,'br5',2455542.13571759,30);
341 INSERT INTO "tagxref" VALUES(19,2,0,26,NULL,2455542.13571759,28);
342 INSERT INTO "tagxref" VALUES(19,2,0,26,NULL,2455542.13571759,30);
343 INSERT INTO "tagxref" VALUES(8,2,0,11,'br2',2455542.12873843,32);
344 INSERT INTO "tagxref" VALUES(13,2,0,11,NULL,2455542.12873843,32);
345 CREATE TABLE backlink(
346 target TEXT,
347 srctype INT,
348 srcid INT,
349 mtime TIMESTAMP,
@@ -369,13 +358,15 @@
358 filename TEXT,
359 comment TEXT,
360 user TEXT
361 );
362 CREATE TABLE ticket(
363 -- Do not change any column that begins with tkt_
364 tkt_id INTEGER PRIMARY KEY,
365 tkt_uuid TEXT UNIQUE,
366 tkt_mtime DATE,
367 -- Add as many field as required below this line
368 type TEXT,
369 status TEXT,
370 subsystem TEXT,
371 priority TEXT,
372 severity TEXT,
373

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button