Fossil SCM
Replace the two GIF images in the www/concepts.wiki document with Pikchrs.
Commit
bd9bf24837b4f73975abc9b2fc96ac51855c7f172671e41377a8f505d23533cc
Parent
8594e7a68a01ed8…
3 files changed
+35
-2
D
www/concept1.gif
Binary file
D
www/concept2.gif
Binary file
+35
-2
| --- www/concepts.wiki | ||
| +++ www/concepts.wiki | ||
| @@ -19,11 +19,27 @@ | ||
| 19 | 19 | |
| 20 | 20 | * [./whyusefossil.wiki#definitions|Definitions] |
| 21 | 21 | * [./quickstart.wiki|Quick start guide] |
| 22 | 22 | |
| 23 | 23 | <h2>2.0 Composition Of A Project</h2> |
| 24 | -<img src="concept1.gif" align="right" hspace="10"> | |
| 24 | + | |
| 25 | +<verbatim type="pikchr float-right"> | |
| 26 | +R1: cylinder "Remote" "Repository" fill 0xadd8e6 rad 70% | |
| 27 | +R2: cylinder same "Remote" "Repository" at 2.5*R1.wid right of R1 | |
| 28 | + spline <-> from R1.e to 0.6<R1.se,R2.sw> then to 0.4<R1.ne,R2.nw> then to R2.w | |
| 29 | + text "HTTP" at .5<R1.ne,R2.nw> | |
| 30 | +R3: cylinder same "Local" "Repository" fill 0x90ee90 \ | |
| 31 | + at dist(R1.e,R2.w) below .5<R1,R2> | |
| 32 | + spline <-> from .5<R1.s,R1.se> to 0.6<R1.s,R3.w> to 0.5<R1.se,R3.n> to .5<R3.nw,R3.n> "HTTP" \ | |
| 33 | + behind R1 | |
| 34 | + spline <-> from R2.sw to .6<R2.sw,R3.n> to .5<R2.s,R3.e> to R3.ne "HTTP" ljust | |
| 35 | +T1: line from 1.0cm heading 200 from R3.sw go 2.2cm heading 150 then 2.2cm west close \ | |
| 36 | + fill 0xffff00 "Local" below "Source Tree" below | |
| 37 | +T2: line from 1.0cm heading 160 from R3.se same "Local" below "Source Tree" below | |
| 38 | + line <-> from R3.sw to T1.start | |
| 39 | + line <-> from R3.se to T2.start | |
| 40 | +</verbatim> | |
| 25 | 41 | |
| 26 | 42 | A software project normally consists of a "source tree". |
| 27 | 43 | A source tree is a hierarchy of files that are used to generate |
| 28 | 44 | the end product. The source tree changes over time as the |
| 29 | 45 | software grows and expands and as features are added and bugs |
| @@ -234,11 +250,28 @@ | ||
| 234 | 250 | token after the name of the Fossil executable, as shown above. |
| 235 | 251 | |
| 236 | 252 | <a name="workflow"></a> |
| 237 | 253 | <h2>4.0 Workflow</h2> |
| 238 | 254 | |
| 239 | -<img src="concept2.gif" align="right" hspace="10" style="max-width:50%;"> | |
| 255 | +<verbatim type="pikchr float-right"> | |
| 256 | + down | |
| 257 | +R1: cylinder "Remote" "Repository" fill 0xadd8e6 rad 70% | |
| 258 | + move 150% | |
| 259 | +R2: cylinder same "Local" "Repository" fill 0x90ee90 | |
| 260 | + move 120% | |
| 261 | +T1: line go 2.2cm heading 150 then 2.2cm west close \ | |
| 262 | + fill 0xffff00 "Local" below "Source Tree" below | |
| 263 | + arrow from R2.n+(-0.25cm,+0.25cm) to R1.s+(-0.25cm,-0.25cm) \ | |
| 264 | + "push " rjust | |
| 265 | + arrow from R1.s+(+0.25cm,-0.25cm) to R2.n+(+0.25cm,+0.25cm) \ | |
| 266 | + " pull" ljust " clone" ljust | |
| 267 | + arrow from T1.start+(-0.25cm,+0cm) to R2.s+(-0.25cm,-0.25cm) \ | |
| 268 | + "commit " rjust | |
| 269 | + arrow from R2.s+(+0.25cm,-0.25cm) to T1.start+(+0.25cm,+0cm) \ | |
| 270 | + " open" ljust " update" ljust " merge" ljust | |
| 271 | +</verbatim> | |
| 272 | + | |
| 240 | 273 | |
| 241 | 274 | Fossil has two modes of operation: <i>"autosync"</i> and |
| 242 | 275 | <i>"manual-merge"</i> |
| 243 | 276 | Autosync mode is reminiscent of CVS or SVN in that it automatically |
| 244 | 277 | keeps your changes in synchronization with your co-workers through |
| 245 | 278 |
| --- www/concepts.wiki | |
| +++ www/concepts.wiki | |
| @@ -19,11 +19,27 @@ | |
| 19 | |
| 20 | * [./whyusefossil.wiki#definitions|Definitions] |
| 21 | * [./quickstart.wiki|Quick start guide] |
| 22 | |
| 23 | <h2>2.0 Composition Of A Project</h2> |
| 24 | <img src="concept1.gif" align="right" hspace="10"> |
| 25 | |
| 26 | A software project normally consists of a "source tree". |
| 27 | A source tree is a hierarchy of files that are used to generate |
| 28 | the end product. The source tree changes over time as the |
| 29 | software grows and expands and as features are added and bugs |
| @@ -234,11 +250,28 @@ | |
| 234 | token after the name of the Fossil executable, as shown above. |
| 235 | |
| 236 | <a name="workflow"></a> |
| 237 | <h2>4.0 Workflow</h2> |
| 238 | |
| 239 | <img src="concept2.gif" align="right" hspace="10" style="max-width:50%;"> |
| 240 | |
| 241 | Fossil has two modes of operation: <i>"autosync"</i> and |
| 242 | <i>"manual-merge"</i> |
| 243 | Autosync mode is reminiscent of CVS or SVN in that it automatically |
| 244 | keeps your changes in synchronization with your co-workers through |
| 245 |
| --- www/concepts.wiki | |
| +++ www/concepts.wiki | |
| @@ -19,11 +19,27 @@ | |
| 19 | |
| 20 | * [./whyusefossil.wiki#definitions|Definitions] |
| 21 | * [./quickstart.wiki|Quick start guide] |
| 22 | |
| 23 | <h2>2.0 Composition Of A Project</h2> |
| 24 | |
| 25 | <verbatim type="pikchr float-right"> |
| 26 | R1: cylinder "Remote" "Repository" fill 0xadd8e6 rad 70% |
| 27 | R2: cylinder same "Remote" "Repository" at 2.5*R1.wid right of R1 |
| 28 | spline <-> from R1.e to 0.6<R1.se,R2.sw> then to 0.4<R1.ne,R2.nw> then to R2.w |
| 29 | text "HTTP" at .5<R1.ne,R2.nw> |
| 30 | R3: cylinder same "Local" "Repository" fill 0x90ee90 \ |
| 31 | at dist(R1.e,R2.w) below .5<R1,R2> |
| 32 | spline <-> from .5<R1.s,R1.se> to 0.6<R1.s,R3.w> to 0.5<R1.se,R3.n> to .5<R3.nw,R3.n> "HTTP" \ |
| 33 | behind R1 |
| 34 | spline <-> from R2.sw to .6<R2.sw,R3.n> to .5<R2.s,R3.e> to R3.ne "HTTP" ljust |
| 35 | T1: line from 1.0cm heading 200 from R3.sw go 2.2cm heading 150 then 2.2cm west close \ |
| 36 | fill 0xffff00 "Local" below "Source Tree" below |
| 37 | T2: line from 1.0cm heading 160 from R3.se same "Local" below "Source Tree" below |
| 38 | line <-> from R3.sw to T1.start |
| 39 | line <-> from R3.se to T2.start |
| 40 | </verbatim> |
| 41 | |
| 42 | A software project normally consists of a "source tree". |
| 43 | A source tree is a hierarchy of files that are used to generate |
| 44 | the end product. The source tree changes over time as the |
| 45 | software grows and expands and as features are added and bugs |
| @@ -234,11 +250,28 @@ | |
| 250 | token after the name of the Fossil executable, as shown above. |
| 251 | |
| 252 | <a name="workflow"></a> |
| 253 | <h2>4.0 Workflow</h2> |
| 254 | |
| 255 | <verbatim type="pikchr float-right"> |
| 256 | down |
| 257 | R1: cylinder "Remote" "Repository" fill 0xadd8e6 rad 70% |
| 258 | move 150% |
| 259 | R2: cylinder same "Local" "Repository" fill 0x90ee90 |
| 260 | move 120% |
| 261 | T1: line go 2.2cm heading 150 then 2.2cm west close \ |
| 262 | fill 0xffff00 "Local" below "Source Tree" below |
| 263 | arrow from R2.n+(-0.25cm,+0.25cm) to R1.s+(-0.25cm,-0.25cm) \ |
| 264 | "push " rjust |
| 265 | arrow from R1.s+(+0.25cm,-0.25cm) to R2.n+(+0.25cm,+0.25cm) \ |
| 266 | " pull" ljust " clone" ljust |
| 267 | arrow from T1.start+(-0.25cm,+0cm) to R2.s+(-0.25cm,-0.25cm) \ |
| 268 | "commit " rjust |
| 269 | arrow from R2.s+(+0.25cm,-0.25cm) to T1.start+(+0.25cm,+0cm) \ |
| 270 | " open" ljust " update" ljust " merge" ljust |
| 271 | </verbatim> |
| 272 | |
| 273 | |
| 274 | Fossil has two modes of operation: <i>"autosync"</i> and |
| 275 | <i>"manual-merge"</i> |
| 276 | Autosync mode is reminiscent of CVS or SVN in that it automatically |
| 277 | keeps your changes in synchronization with your co-workers through |
| 278 |