Fossil SCM

Changed update docs, ** ADDED A _SPECIAL_ (but MUTYPE_BLOCK) wikitag <annotation> to put html comments in wikimarkup

kejoki 2009-01-30 21:18 trunk
Commit 51868cb12fe74cc7a980ec7be86b25c7a815afae
Parent f8f8baf945fb418…
4 files changed +64 -49 +1 +22 -14 +1 -1
~ src/wikiformat.c ~ www/cmd_sync.wiki ~ www/cmd_update.wiki ~ www/reference.wiki
M src/wikiformat.c
+64 -49
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1,7 +1,7 @@
11
 /*
2
-** Copyright (c) 2007 D. Richard Hipp
2
+** Copyright (c) 2007, 2009 D. Richard Hipp
33
 **
44
 ** This program is free software; you can redistribute it and/or
55
 ** modify it under the terms of the GNU General Public
66
 ** License version 2 as published by the Free Software Foundation.
77
 **
@@ -156,56 +156,57 @@
156156
 ** in aAllowedMarkup[].
157157
 */
158158
 #define MARKUP_INVALID 0
159159
 #define MARKUP_A 1
160160
 #define MARKUP_ADDRESS 2
161
-#define MARKUP_B 3
162
-#define MARKUP_BIG 4
163
-#define MARKUP_BLOCKQUOTE 5
164
-#define MARKUP_BR 6
165
-#define MARKUP_CENTER 7
166
-#define MARKUP_CITE 8
167
-#define MARKUP_CODE 9
168
-#define MARKUP_DD 10
169
-#define MARKUP_DFN 11
170
-#define MARKUP_DIV 12
171
-#define MARKUP_DL 13
172
-#define MARKUP_DT 14
173
-#define MARKUP_EM 15
174
-#define MARKUP_FONT 16
175
-#define MARKUP_H1 17
176
-#define MARKUP_H2 18
177
-#define MARKUP_H3 19
178
-#define MARKUP_H4 20
179
-#define MARKUP_H5 21
180
-#define MARKUP_H6 22
181
-#define MARKUP_HR 23
182
-#define MARKUP_I 24
183
-#define MARKUP_IMG 25
184
-#define MARKUP_KBD 26
185
-#define MARKUP_LI 27
186
-#define MARKUP_NOBR 28
187
-#define MARKUP_NOWIKI 29
188
-#define MARKUP_OL 30
189
-#define MARKUP_P 31
190
-#define MARKUP_PRE 32
191
-#define MARKUP_S 33
192
-#define MARKUP_SAMP 34
193
-#define MARKUP_SMALL 35
194
-#define MARKUP_STRIKE 36
195
-#define MARKUP_STRONG 37
196
-#define MARKUP_SUB 38
197
-#define MARKUP_SUP 39
198
-#define MARKUP_TABLE 40
199
-#define MARKUP_TD 41
200
-#define MARKUP_TH 42
201
-#define MARKUP_TR 43
202
-#define MARKUP_TT 44
203
-#define MARKUP_U 45
204
-#define MARKUP_UL 46
205
-#define MARKUP_VAR 47
206
-#define MARKUP_VERBATIM 48
161
+#define MARKUP_ANNOTATION 3
162
+#define MARKUP_B 4
163
+#define MARKUP_BIG 5
164
+#define MARKUP_BLOCKQUOTE 6
165
+#define MARKUP_BR 7
166
+#define MARKUP_CENTER 8
167
+#define MARKUP_CITE 9
168
+#define MARKUP_CODE 10
169
+#define MARKUP_DD 11
170
+#define MARKUP_DFN 12
171
+#define MARKUP_DIV 13
172
+#define MARKUP_DL 14
173
+#define MARKUP_DT 15
174
+#define MARKUP_EM 16
175
+#define MARKUP_FONT 17
176
+#define MARKUP_H1 18
177
+#define MARKUP_H2 19
178
+#define MARKUP_H3 20
179
+#define MARKUP_H4 21
180
+#define MARKUP_H5 22
181
+#define MARKUP_H6 23
182
+#define MARKUP_HR 24
183
+#define MARKUP_I 25
184
+#define MARKUP_IMG 26
185
+#define MARKUP_KBD 27
186
+#define MARKUP_LI 28
187
+#define MARKUP_NOBR 29
188
+#define MARKUP_NOWIKI 30
189
+#define MARKUP_OL 31
190
+#define MARKUP_P 32
191
+#define MARKUP_PRE 33
192
+#define MARKUP_S 34
193
+#define MARKUP_SAMP 35
194
+#define MARKUP_SMALL 36
195
+#define MARKUP_STRIKE 37
196
+#define MARKUP_STRONG 38
197
+#define MARKUP_SUB 39
198
+#define MARKUP_SUP 40
199
+#define MARKUP_TABLE 41
200
+#define MARKUP_TD 42
201
+#define MARKUP_TH 43
202
+#define MARKUP_TR 44
203
+#define MARKUP_TT 45
204
+#define MARKUP_U 46
205
+#define MARKUP_UL 47
206
+#define MARKUP_VAR 48
207
+#define MARKUP_VERBATIM 49
207208
208209
 /*
209210
 ** The various markup is divided into the following types:
210211
 */
211212
 #define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
@@ -214,11 +215,11 @@
214215
 #define MUTYPE_LIST 0x0010 /* Lists. <ol>, <ul>, or <dl> */
215216
 #define MUTYPE_LI 0x0020 /* List items. <li>, <dd>, <dt> */
216217
 #define MUTYPE_TABLE 0x0040 /* <table> */
217218
 #define MUTYPE_TR 0x0080 /* <tr> */
218219
 #define MUTYPE_TD 0x0100 /* <td> or <th> */
219
-#define MUTYPE_SPECIAL 0x0200 /* <nowiki> or <verbatim> */
220
+#define MUTYPE_SPECIAL 0x0200 /* <annotation>, <nowiki> or <verbatim> */
220221
 #define MUTYPE_HYPERLINK 0x0400 /* <a> */
221222
222223
 /*
223224
 ** These markup types must have an end tag.
224225
 */
@@ -237,10 +238,11 @@
237238
 } aMarkup[] = {
238239
 { 0, MARKUP_INVALID, 0, 0 },
239240
 { "a", MARKUP_A, MUTYPE_HYPERLINK,
240241
 AMSK_HREF|AMSK_NAME },
241242
 { "address", MARKUP_ADDRESS, MUTYPE_BLOCK, 0 },
243
+ { "annotation", MARKUP_ANNOTATION, MUTYPE_BLOCK, 0 },
242244
 { "b", MARKUP_B, MUTYPE_FONT, 0 },
243245
 { "big", MARKUP_BIG, MUTYPE_FONT, 0 },
244246
 { "blockquote", MARKUP_BLOCKQUOTE, MUTYPE_BLOCK, 0 },
245247
 { "br", MARKUP_BR, MUTYPE_SINGLE, AMSK_CLEAR },
246248
 { "center", MARKUP_CENTER, MUTYPE_BLOCK, 0 },
@@ -1140,10 +1142,16 @@
11401142
 }
11411143
 case TOKEN_MARKUP: {
11421144
 const char *zId;
11431145
 int iDiv;
11441146
 parseMarkup(&markup, z);
1147
+
1148
+ /* Annotation markup turns into HTML comment */
1149
+ if( markup.iCode==MARKUP_ANNOTATION && markup.endTag ){
1150
+ blob_append(p->pOut, "-->", 3);
1151
+ break;
1152
+ }
11451153
11461154
 /* Markup of the form </div id=ID> where there is a matching
11471155
 ** ID somewhere on the stack. Exit the verbatim if were are in
11481156
 ** it. Pop the stack up to the matching <div>. Discard the
11491157
 ** </div>
@@ -1166,11 +1174,11 @@
11661174
 assert( p->nStack==iDiv+1 );
11671175
 p->nStack--;
11681176
 }else
11691177
11701178
 /* If within <verbatim id=ID> ignore everything other than
1171
- ** </verbatim id=ID> and the </dev id=ID2> above.
1179
+ ** </verbatim id=ID> and the </div id=ID2> above.
11721180
 */
11731181
 if( p->inVerbatim ){
11741182
 if( endVerbatim(p, &markup) ){
11751183
 p->inVerbatim = 0;
11761184
 p->state = p->preVerbState;
@@ -1239,10 +1247,17 @@
12391247
 p->preVerbState = p->state;
12401248
 p->state &= ~ALLOW_WIKI;
12411249
 blob_append(p->pOut, "<pre class='verbatim'>",-1);
12421250
 p->wantAutoParagraph = 0;
12431251
 }else
1252
+
1253
+ /* Annotation markup starts an HTML comment */
1254
+ if( markup.iCode==MARKUP_ANNOTATION ){
1255
+ p->wantAutoParagraph = 0;
1256
+ blob_append(p->pOut, "<!-- ", 5);
1257
+ }else
1258
+
12441259
 if( markup.iType==MUTYPE_LI ){
12451260
 if( backupToType(p, MUTYPE_LIST)==0 ){
12461261
 pushStack(p, MARKUP_UL);
12471262
 blob_append(p->pOut, "<ul>", 4);
12481263
 }
12491264
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1,7 +1,7 @@
1 /*
2 ** Copyright (c) 2007 D. Richard Hipp
3 **
4 ** This program is free software; you can redistribute it and/or
5 ** modify it under the terms of the GNU General Public
6 ** License version 2 as published by the Free Software Foundation.
7 **
@@ -156,56 +156,57 @@
156 ** in aAllowedMarkup[].
157 */
158 #define MARKUP_INVALID 0
159 #define MARKUP_A 1
160 #define MARKUP_ADDRESS 2
161 #define MARKUP_B 3
162 #define MARKUP_BIG 4
163 #define MARKUP_BLOCKQUOTE 5
164 #define MARKUP_BR 6
165 #define MARKUP_CENTER 7
166 #define MARKUP_CITE 8
167 #define MARKUP_CODE 9
168 #define MARKUP_DD 10
169 #define MARKUP_DFN 11
170 #define MARKUP_DIV 12
171 #define MARKUP_DL 13
172 #define MARKUP_DT 14
173 #define MARKUP_EM 15
174 #define MARKUP_FONT 16
175 #define MARKUP_H1 17
176 #define MARKUP_H2 18
177 #define MARKUP_H3 19
178 #define MARKUP_H4 20
179 #define MARKUP_H5 21
180 #define MARKUP_H6 22
181 #define MARKUP_HR 23
182 #define MARKUP_I 24
183 #define MARKUP_IMG 25
184 #define MARKUP_KBD 26
185 #define MARKUP_LI 27
186 #define MARKUP_NOBR 28
187 #define MARKUP_NOWIKI 29
188 #define MARKUP_OL 30
189 #define MARKUP_P 31
190 #define MARKUP_PRE 32
191 #define MARKUP_S 33
192 #define MARKUP_SAMP 34
193 #define MARKUP_SMALL 35
194 #define MARKUP_STRIKE 36
195 #define MARKUP_STRONG 37
196 #define MARKUP_SUB 38
197 #define MARKUP_SUP 39
198 #define MARKUP_TABLE 40
199 #define MARKUP_TD 41
200 #define MARKUP_TH 42
201 #define MARKUP_TR 43
202 #define MARKUP_TT 44
203 #define MARKUP_U 45
204 #define MARKUP_UL 46
205 #define MARKUP_VAR 47
206 #define MARKUP_VERBATIM 48
 
207
208 /*
209 ** The various markup is divided into the following types:
210 */
211 #define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
@@ -214,11 +215,11 @@
214 #define MUTYPE_LIST 0x0010 /* Lists. <ol>, <ul>, or <dl> */
215 #define MUTYPE_LI 0x0020 /* List items. <li>, <dd>, <dt> */
216 #define MUTYPE_TABLE 0x0040 /* <table> */
217 #define MUTYPE_TR 0x0080 /* <tr> */
218 #define MUTYPE_TD 0x0100 /* <td> or <th> */
219 #define MUTYPE_SPECIAL 0x0200 /* <nowiki> or <verbatim> */
220 #define MUTYPE_HYPERLINK 0x0400 /* <a> */
221
222 /*
223 ** These markup types must have an end tag.
224 */
@@ -237,10 +238,11 @@
237 } aMarkup[] = {
238 { 0, MARKUP_INVALID, 0, 0 },
239 { "a", MARKUP_A, MUTYPE_HYPERLINK,
240 AMSK_HREF|AMSK_NAME },
241 { "address", MARKUP_ADDRESS, MUTYPE_BLOCK, 0 },
 
242 { "b", MARKUP_B, MUTYPE_FONT, 0 },
243 { "big", MARKUP_BIG, MUTYPE_FONT, 0 },
244 { "blockquote", MARKUP_BLOCKQUOTE, MUTYPE_BLOCK, 0 },
245 { "br", MARKUP_BR, MUTYPE_SINGLE, AMSK_CLEAR },
246 { "center", MARKUP_CENTER, MUTYPE_BLOCK, 0 },
@@ -1140,10 +1142,16 @@
1140 }
1141 case TOKEN_MARKUP: {
1142 const char *zId;
1143 int iDiv;
1144 parseMarkup(&markup, z);
 
 
 
 
 
 
1145
1146 /* Markup of the form </div id=ID> where there is a matching
1147 ** ID somewhere on the stack. Exit the verbatim if were are in
1148 ** it. Pop the stack up to the matching <div>. Discard the
1149 ** </div>
@@ -1166,11 +1174,11 @@
1166 assert( p->nStack==iDiv+1 );
1167 p->nStack--;
1168 }else
1169
1170 /* If within <verbatim id=ID> ignore everything other than
1171 ** </verbatim id=ID> and the </dev id=ID2> above.
1172 */
1173 if( p->inVerbatim ){
1174 if( endVerbatim(p, &markup) ){
1175 p->inVerbatim = 0;
1176 p->state = p->preVerbState;
@@ -1239,10 +1247,17 @@
1239 p->preVerbState = p->state;
1240 p->state &= ~ALLOW_WIKI;
1241 blob_append(p->pOut, "<pre class='verbatim'>",-1);
1242 p->wantAutoParagraph = 0;
1243 }else
 
 
 
 
 
 
 
1244 if( markup.iType==MUTYPE_LI ){
1245 if( backupToType(p, MUTYPE_LIST)==0 ){
1246 pushStack(p, MARKUP_UL);
1247 blob_append(p->pOut, "<ul>", 4);
1248 }
1249
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1,7 +1,7 @@
1 /*
2 ** Copyright (c) 2007, 2009 D. Richard Hipp
3 **
4 ** This program is free software; you can redistribute it and/or
5 ** modify it under the terms of the GNU General Public
6 ** License version 2 as published by the Free Software Foundation.
7 **
@@ -156,56 +156,57 @@
156 ** in aAllowedMarkup[].
157 */
158 #define MARKUP_INVALID 0
159 #define MARKUP_A 1
160 #define MARKUP_ADDRESS 2
161 #define MARKUP_ANNOTATION 3
162 #define MARKUP_B 4
163 #define MARKUP_BIG 5
164 #define MARKUP_BLOCKQUOTE 6
165 #define MARKUP_BR 7
166 #define MARKUP_CENTER 8
167 #define MARKUP_CITE 9
168 #define MARKUP_CODE 10
169 #define MARKUP_DD 11
170 #define MARKUP_DFN 12
171 #define MARKUP_DIV 13
172 #define MARKUP_DL 14
173 #define MARKUP_DT 15
174 #define MARKUP_EM 16
175 #define MARKUP_FONT 17
176 #define MARKUP_H1 18
177 #define MARKUP_H2 19
178 #define MARKUP_H3 20
179 #define MARKUP_H4 21
180 #define MARKUP_H5 22
181 #define MARKUP_H6 23
182 #define MARKUP_HR 24
183 #define MARKUP_I 25
184 #define MARKUP_IMG 26
185 #define MARKUP_KBD 27
186 #define MARKUP_LI 28
187 #define MARKUP_NOBR 29
188 #define MARKUP_NOWIKI 30
189 #define MARKUP_OL 31
190 #define MARKUP_P 32
191 #define MARKUP_PRE 33
192 #define MARKUP_S 34
193 #define MARKUP_SAMP 35
194 #define MARKUP_SMALL 36
195 #define MARKUP_STRIKE 37
196 #define MARKUP_STRONG 38
197 #define MARKUP_SUB 39
198 #define MARKUP_SUP 40
199 #define MARKUP_TABLE 41
200 #define MARKUP_TD 42
201 #define MARKUP_TH 43
202 #define MARKUP_TR 44
203 #define MARKUP_TT 45
204 #define MARKUP_U 46
205 #define MARKUP_UL 47
206 #define MARKUP_VAR 48
207 #define MARKUP_VERBATIM 49
208
209 /*
210 ** The various markup is divided into the following types:
211 */
212 #define MUTYPE_SINGLE 0x0001 /* <img>, <br>, or <hr> */
@@ -214,11 +215,11 @@
215 #define MUTYPE_LIST 0x0010 /* Lists. <ol>, <ul>, or <dl> */
216 #define MUTYPE_LI 0x0020 /* List items. <li>, <dd>, <dt> */
217 #define MUTYPE_TABLE 0x0040 /* <table> */
218 #define MUTYPE_TR 0x0080 /* <tr> */
219 #define MUTYPE_TD 0x0100 /* <td> or <th> */
220 #define MUTYPE_SPECIAL 0x0200 /* <annotation>, <nowiki> or <verbatim> */
221 #define MUTYPE_HYPERLINK 0x0400 /* <a> */
222
223 /*
224 ** These markup types must have an end tag.
225 */
@@ -237,10 +238,11 @@
238 } aMarkup[] = {
239 { 0, MARKUP_INVALID, 0, 0 },
240 { "a", MARKUP_A, MUTYPE_HYPERLINK,
241 AMSK_HREF|AMSK_NAME },
242 { "address", MARKUP_ADDRESS, MUTYPE_BLOCK, 0 },
243 { "annotation", MARKUP_ANNOTATION, MUTYPE_BLOCK, 0 },
244 { "b", MARKUP_B, MUTYPE_FONT, 0 },
245 { "big", MARKUP_BIG, MUTYPE_FONT, 0 },
246 { "blockquote", MARKUP_BLOCKQUOTE, MUTYPE_BLOCK, 0 },
247 { "br", MARKUP_BR, MUTYPE_SINGLE, AMSK_CLEAR },
248 { "center", MARKUP_CENTER, MUTYPE_BLOCK, 0 },
@@ -1140,10 +1142,16 @@
1142 }
1143 case TOKEN_MARKUP: {
1144 const char *zId;
1145 int iDiv;
1146 parseMarkup(&markup, z);
1147
1148 /* Annotation markup turns into HTML comment */
1149 if( markup.iCode==MARKUP_ANNOTATION && markup.endTag ){
1150 blob_append(p->pOut, "-->", 3);
1151 break;
1152 }
1153
1154 /* Markup of the form </div id=ID> where there is a matching
1155 ** ID somewhere on the stack. Exit the verbatim if were are in
1156 ** it. Pop the stack up to the matching <div>. Discard the
1157 ** </div>
@@ -1166,11 +1174,11 @@
1174 assert( p->nStack==iDiv+1 );
1175 p->nStack--;
1176 }else
1177
1178 /* If within <verbatim id=ID> ignore everything other than
1179 ** </verbatim id=ID> and the </div id=ID2> above.
1180 */
1181 if( p->inVerbatim ){
1182 if( endVerbatim(p, &markup) ){
1183 p->inVerbatim = 0;
1184 p->state = p->preVerbState;
@@ -1239,10 +1247,17 @@
1247 p->preVerbState = p->state;
1248 p->state &= ~ALLOW_WIKI;
1249 blob_append(p->pOut, "<pre class='verbatim'>",-1);
1250 p->wantAutoParagraph = 0;
1251 }else
1252
1253 /* Annotation markup starts an HTML comment */
1254 if( markup.iCode==MARKUP_ANNOTATION ){
1255 p->wantAutoParagraph = 0;
1256 blob_append(p->pOut, "<!-- ", 5);
1257 }else
1258
1259 if( markup.iType==MUTYPE_LI ){
1260 if( backupToType(p, MUTYPE_LIST)==0 ){
1261 pushStack(p, MARKUP_UL);
1262 blob_append(p->pOut, "<ul>", 4);
1263 }
1264
M www/cmd_sync.wiki
+1
--- www/cmd_sync.wiki
+++ www/cmd_sync.wiki
@@ -17,6 +17,7 @@
1717
 version <em>unless</em> you customize your configuration.
1818
1919
 See also: [./cmd_pull.wiki | fossil pull],
2020
 [./cmd_push.wiki | fossil push],
2121
 [./cmd_setting.wiki | fossil setting],
22
+[./branching.wiki | <i>branching, merging, forking and tagging</i>],
2223
 [./reference.wiki | Reference]
2324
--- www/cmd_sync.wiki
+++ www/cmd_sync.wiki
@@ -17,6 +17,7 @@
17 version <em>unless</em> you customize your configuration.
18
19 See also: [./cmd_pull.wiki | fossil pull],
20 [./cmd_push.wiki | fossil push],
21 [./cmd_setting.wiki | fossil setting],
 
22 [./reference.wiki | Reference]
23
--- www/cmd_sync.wiki
+++ www/cmd_sync.wiki
@@ -17,6 +17,7 @@
17 version <em>unless</em> you customize your configuration.
18
19 See also: [./cmd_pull.wiki | fossil pull],
20 [./cmd_push.wiki | fossil push],
21 [./cmd_setting.wiki | fossil setting],
22 [./branching.wiki | <i>branching, merging, forking and tagging</i>],
23 [./reference.wiki | Reference]
24
M www/cmd_update.wiki
+22 -14
--- www/cmd_update.wiki
+++ www/cmd_update.wiki
@@ -1,33 +1,41 @@
11
 <h2>update</h2>
22
3
-What do you do if you have changes out on a repository and
4
-you want them merged with your checkout?
5
-
6
-You use the <code>update</code> command.
7
-
8
-<b>fossil</b> can [./about_checkout.wiki | overwrite] any
9
-changes you've made to your checkout, or it can
10
-[./about_merge.wiki | merge] whatever changes have occurred
11
-in the repo into your checkout.
3
+<u>Updating</u> a repository is the process of applying to it changes
4
+made by external entities. Contrast this with [./cmd_commit.wiki |
5
+commit]ing a locally made change; updating is a bit like "committing"
6
+external changes to the local repo.
127
138
 Update <em>merges</em> changes from the repository into your checkout.
9
+That means that it won't have any effect unless there <i>are</i>
10
+changes in the repository. The only way the checkout can affect
11
+the repo (this is the local repo we're talking about) is if you
12
+do a [./cmd_commit.wiki | <code>ci</code>]. So, <code>update</code>
13
+only really makes sense if you have
14
+[./cmd_pull.wiki | <code>pull</code>]ed changes from the master repository
15
+into the local repository.
1416
15
-<b>fossil</b> uses a simple conflict resolution strategy for merges:
16
-the latest change wins.
17
+<annotation>
18
+ Note :
19
+ really really need a quick overview of the pull-update-edit-commit-push
20
+ workflow, and the shortcuts for that, and re-emphasize the role of autosync
21
+ in changing the basic nature of the workflow
22
+</annotation>
1723
1824
 Local intranet <code>[./cmd_commit.wiki | commit]</code>s
1925
 (by someone else)
2026
 or Net <code>[./cmd_pull.wiki | pull]</code>s from a server
21
-will usually require a <code>fossil&nbsp;update</code> afterward.
27
+will usually require a <code>fossil&nbsp;update</code> afterward,
28
+because they are likely not to be done in
29
+[./cmd_settings.wiki#autosync | autosync]
30
+mode.
2231
2332
 Local commits are likely to be made with
2433
 [./cmd_settings.wiki#autosync | automatic syncing]
2534
 set to "on", however, so if you don't use <b>fossil</b> for Net-wide
2635
 projects you may never have to use <code>update</code>.
2736
2837
 See also: [./cmd_pull.wiki | fossil pull],
2938
 [./cmd_commit.wiki | fossil commit],
3039
 [./cmd_settings.wiki#autosync | fossil setting] (autosync),
31
-[./about_checkout.wiki | <i>checkouts</i>],
32
-[./about_merge.wiki | <i>merging</i>],
40
+[./branching.wiki | <i>branching, merging, forking and tagging</i>],
3341
 [./reference.wiki | Reference]
3442
--- www/cmd_update.wiki
+++ www/cmd_update.wiki
@@ -1,33 +1,41 @@
1 <h2>update</h2>
2
3 What do you do if you have changes out on a repository and
4 you want them merged with your checkout?
5
6 You use the <code>update</code> command.
7
8 <b>fossil</b> can [./about_checkout.wiki | overwrite] any
9 changes you've made to your checkout, or it can
10 [./about_merge.wiki | merge] whatever changes have occurred
11 in the repo into your checkout.
12
13 Update <em>merges</em> changes from the repository into your checkout.
 
 
 
 
 
 
 
14
15 <b>fossil</b> uses a simple conflict resolution strategy for merges:
16 the latest change wins.
 
 
 
 
17
18 Local intranet <code>[./cmd_commit.wiki | commit]</code>s
19 (by someone else)
20 or Net <code>[./cmd_pull.wiki | pull]</code>s from a server
21 will usually require a <code>fossil&nbsp;update</code> afterward.
 
 
 
22
23 Local commits are likely to be made with
24 [./cmd_settings.wiki#autosync | automatic syncing]
25 set to "on", however, so if you don't use <b>fossil</b> for Net-wide
26 projects you may never have to use <code>update</code>.
27
28 See also: [./cmd_pull.wiki | fossil pull],
29 [./cmd_commit.wiki | fossil commit],
30 [./cmd_settings.wiki#autosync | fossil setting] (autosync),
31 [./about_checkout.wiki | <i>checkouts</i>],
32 [./about_merge.wiki | <i>merging</i>],
33 [./reference.wiki | Reference]
34
--- www/cmd_update.wiki
+++ www/cmd_update.wiki
@@ -1,33 +1,41 @@
1 <h2>update</h2>
2
3 <u>Updating</u> a repository is the process of applying to it changes
4 made by external entities. Contrast this with [./cmd_commit.wiki |
5 commit]ing a locally made change; updating is a bit like "committing"
6 external changes to the local repo.
 
 
 
 
 
7
8 Update <em>merges</em> changes from the repository into your checkout.
9 That means that it won't have any effect unless there <i>are</i>
10 changes in the repository. The only way the checkout can affect
11 the repo (this is the local repo we're talking about) is if you
12 do a [./cmd_commit.wiki | <code>ci</code>]. So, <code>update</code>
13 only really makes sense if you have
14 [./cmd_pull.wiki | <code>pull</code>]ed changes from the master repository
15 into the local repository.
16
17 <annotation>
18 Note :
19 really really need a quick overview of the pull-update-edit-commit-push
20 workflow, and the shortcuts for that, and re-emphasize the role of autosync
21 in changing the basic nature of the workflow
22 </annotation>
23
24 Local intranet <code>[./cmd_commit.wiki | commit]</code>s
25 (by someone else)
26 or Net <code>[./cmd_pull.wiki | pull]</code>s from a server
27 will usually require a <code>fossil&nbsp;update</code> afterward,
28 because they are likely not to be done in
29 [./cmd_settings.wiki#autosync | autosync]
30 mode.
31
32 Local commits are likely to be made with
33 [./cmd_settings.wiki#autosync | automatic syncing]
34 set to "on", however, so if you don't use <b>fossil</b> for Net-wide
35 projects you may never have to use <code>update</code>.
36
37 See also: [./cmd_pull.wiki | fossil pull],
38 [./cmd_commit.wiki | fossil commit],
39 [./cmd_settings.wiki#autosync | fossil setting] (autosync),
40 [./branching.wiki | <i>branching, merging, forking and tagging</i>],
 
41 [./reference.wiki | Reference]
42
M www/reference.wiki
+1 -1
--- www/reference.wiki
+++ www/reference.wiki
@@ -111,11 +111,11 @@
111111
 <td><a href="#info">info</a></td>
112112
 <td><a href="#reconstruct">reconstruct</a></td>
113113
 <td><a href="#tag">tag</a></td>
114114
 </tr>
115115
 </table><nowiki><pre>
116
-This is fossil version [b12a031557] 2008-12-26 17:41:09 UTC
116
+This is fossil version [f8f8baf945] 2009-01-29 19:11:52 UTC
117117
 </pre>
118118
 <b>What follows</b> is a survey of what you get if you type<code>
119119
 fossil&nbsp;help&nbsp;<i>command</i> </code>for all of the
120120
 commands listed above. There are links to individual pages for each
121121
 of them; pages with content (commands marked with a '*' are done) go
122122
--- www/reference.wiki
+++ www/reference.wiki
@@ -111,11 +111,11 @@
111 <td><a href="#info">info</a></td>
112 <td><a href="#reconstruct">reconstruct</a></td>
113 <td><a href="#tag">tag</a></td>
114 </tr>
115 </table><nowiki><pre>
116 This is fossil version [b12a031557] 2008-12-26 17:41:09 UTC
117 </pre>
118 <b>What follows</b> is a survey of what you get if you type<code>
119 fossil&nbsp;help&nbsp;<i>command</i> </code>for all of the
120 commands listed above. There are links to individual pages for each
121 of them; pages with content (commands marked with a '*' are done) go
122
--- www/reference.wiki
+++ www/reference.wiki
@@ -111,11 +111,11 @@
111 <td><a href="#info">info</a></td>
112 <td><a href="#reconstruct">reconstruct</a></td>
113 <td><a href="#tag">tag</a></td>
114 </tr>
115 </table><nowiki><pre>
116 This is fossil version [f8f8baf945] 2009-01-29 19:11:52 UTC
117 </pre>
118 <b>What follows</b> is a survey of what you get if you type<code>
119 fossil&nbsp;help&nbsp;<i>command</i> </code>for all of the
120 commands listed above. There are links to individual pages for each
121 of them; pages with content (commands marked with a '*' are done) go
122

Keyboard Shortcuts

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