Fossil SCM
The rebaseharm.md doc referred to rebase04.svg *twice*, so while all SVGs associated with the doc were replaced, the second became a broken link when the SVG files were removed. Simply duplicating the code with comments to try to stave off version drift for now.
Commit
a61ac66b63a3c757e16187902562a64026a30c076766c6d1585232e98a6a2fd7
Parent
d82534b3acd76e9…
1 file changed
+27
-1
+27
-1
| --- www/rebaseharm.md | ||
| +++ www/rebaseharm.md | ||
| @@ -124,10 +124,11 @@ | ||
| 124 | 124 | for rebase say that you should rebase the feature branch to the tip |
| 125 | 125 | of main in order to remove main-line development differences from |
| 126 | 126 | the feature branch's history: |
| 127 | 127 | |
| 128 | 128 | ~~~ pikchr toggle |
| 129 | +# Duplicated below in section 5.0 | |
| 129 | 130 | scale = 0.8 |
| 130 | 131 | circle "C0" fit fill white |
| 131 | 132 | arrow right 50% |
| 132 | 133 | circle same "C1" |
| 133 | 134 | arrow same |
| @@ -271,11 +272,36 @@ | ||
| 271 | 272 | |
| 272 | 273 | ## <a name="timestamps"></a>5.0 Rebase causes timestamp confusion |
| 273 | 274 | |
| 274 | 275 | Consider the earlier example of rebasing a feature branch: |
| 275 | 276 | |
| 276 | - | |
| 277 | +~~~ pikchr toggle | |
| 278 | +# Copy of second diagram in section 2.2 above | |
| 279 | +scale = 0.8 | |
| 280 | +circle "C0" fit fill white | |
| 281 | +arrow right 50% | |
| 282 | +circle same "C1" | |
| 283 | +arrow same | |
| 284 | +circle same "C2" | |
| 285 | +arrow same | |
| 286 | +circle same "C4" | |
| 287 | +arrow same | |
| 288 | +circle same "C6" | |
| 289 | +circle same "C3" at last arrow.width + C0.rad*2 heading 30 from C2 | |
| 290 | +arrow right 50% | |
| 291 | +circle same "C5" | |
| 292 | +arrow from C2 to C3 chop | |
| 293 | +C3P: circle same "C3'" at first arrow.width + C0.rad*2 heading 30 from C6 | |
| 294 | +arrow right 50% from C3P.e | |
| 295 | +C5P: circle same "C5'" | |
| 296 | +arrow from C6 to C3P chop | |
| 297 | + | |
| 298 | +box ht C3.y-C2.y wid C5P.e.x-C0.w.x+1.5*C1.rad with .w at 0.5*(first arrow.wid) west of C0.w \ | |
| 299 | + behind C0 fill 0xc6e2ff color 0xaac5df | |
| 300 | +box ht previous.ht wid previous.e.x - C2.w.x with .se at previous.ne \ | |
| 301 | + behind C0 fill 0x9accfc color 0xaac5df | |
| 302 | +~~~ | |
| 277 | 303 | |
| 278 | 304 | What timestamps go on the C3\' and C5\' check-ins? If you choose |
| 279 | 305 | the same timestamps as the original C3 and C5, then you have the |
| 280 | 306 | odd situation C3' is older than its parent C6. We call that a |
| 281 | 307 | "timewarp" in Fossil. Timewarps can also happen due to misconfigured |
| 282 | 308 |
| --- www/rebaseharm.md | |
| +++ www/rebaseharm.md | |
| @@ -124,10 +124,11 @@ | |
| 124 | for rebase say that you should rebase the feature branch to the tip |
| 125 | of main in order to remove main-line development differences from |
| 126 | the feature branch's history: |
| 127 | |
| 128 | ~~~ pikchr toggle |
| 129 | scale = 0.8 |
| 130 | circle "C0" fit fill white |
| 131 | arrow right 50% |
| 132 | circle same "C1" |
| 133 | arrow same |
| @@ -271,11 +272,36 @@ | |
| 271 | |
| 272 | ## <a name="timestamps"></a>5.0 Rebase causes timestamp confusion |
| 273 | |
| 274 | Consider the earlier example of rebasing a feature branch: |
| 275 | |
| 276 |  |
| 277 | |
| 278 | What timestamps go on the C3\' and C5\' check-ins? If you choose |
| 279 | the same timestamps as the original C3 and C5, then you have the |
| 280 | odd situation C3' is older than its parent C6. We call that a |
| 281 | "timewarp" in Fossil. Timewarps can also happen due to misconfigured |
| 282 |
| --- www/rebaseharm.md | |
| +++ www/rebaseharm.md | |
| @@ -124,10 +124,11 @@ | |
| 124 | for rebase say that you should rebase the feature branch to the tip |
| 125 | of main in order to remove main-line development differences from |
| 126 | the feature branch's history: |
| 127 | |
| 128 | ~~~ pikchr toggle |
| 129 | # Duplicated below in section 5.0 |
| 130 | scale = 0.8 |
| 131 | circle "C0" fit fill white |
| 132 | arrow right 50% |
| 133 | circle same "C1" |
| 134 | arrow same |
| @@ -271,11 +272,36 @@ | |
| 272 | |
| 273 | ## <a name="timestamps"></a>5.0 Rebase causes timestamp confusion |
| 274 | |
| 275 | Consider the earlier example of rebasing a feature branch: |
| 276 | |
| 277 | ~~~ pikchr toggle |
| 278 | # Copy of second diagram in section 2.2 above |
| 279 | scale = 0.8 |
| 280 | circle "C0" fit fill white |
| 281 | arrow right 50% |
| 282 | circle same "C1" |
| 283 | arrow same |
| 284 | circle same "C2" |
| 285 | arrow same |
| 286 | circle same "C4" |
| 287 | arrow same |
| 288 | circle same "C6" |
| 289 | circle same "C3" at last arrow.width + C0.rad*2 heading 30 from C2 |
| 290 | arrow right 50% |
| 291 | circle same "C5" |
| 292 | arrow from C2 to C3 chop |
| 293 | C3P: circle same "C3'" at first arrow.width + C0.rad*2 heading 30 from C6 |
| 294 | arrow right 50% from C3P.e |
| 295 | C5P: circle same "C5'" |
| 296 | arrow from C6 to C3P chop |
| 297 | |
| 298 | box ht C3.y-C2.y wid C5P.e.x-C0.w.x+1.5*C1.rad with .w at 0.5*(first arrow.wid) west of C0.w \ |
| 299 | behind C0 fill 0xc6e2ff color 0xaac5df |
| 300 | box ht previous.ht wid previous.e.x - C2.w.x with .se at previous.ne \ |
| 301 | behind C0 fill 0x9accfc color 0xaac5df |
| 302 | ~~~ |
| 303 | |
| 304 | What timestamps go on the C3\' and C5\' check-ins? If you choose |
| 305 | the same timestamps as the original C3 and C5, then you have the |
| 306 | odd situation C3' is older than its parent C6. We call that a |
| 307 | "timewarp" in Fossil. Timewarps can also happen due to misconfigured |
| 308 |