Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Typo fixes |
|---|---|
| Timelines: | family | ancestors | descendants | both | doc-overhaul |
| Files: | files | file ages | folders |
| SHA3-256: |
f5da46e8f96dd2799a675938d6f2a9f7 |
| User & Date: | aku 2019-04-10 21:06:29 |
Context
|
2019-04-12
| ||
| 15:12 | Get doctools example and indent fixes check-in: 5f9bcaa466 user: aku tags: doc-overhaul | |
|
2019-04-10
| ||
| 21:06 | Typo fixes check-in: f5da46e8f9 user: aku tags: doc-overhaul | |
| 20:58 | Bring md special-char/verbatim fixes to the devguide check-in: 43904ac14b user: aku tags: doc-overhaul | |
Changes
Changes to devdoc/parts/d_op_branch_close.inc.
21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 |
[enum] Validate the checkout again. The incoming trunk changes may
have broken something now. Do any required fixes.
[enum] Now merge to the trunk using
[example {
fossil update trunk
fossil merge --integrate YOU_BRANCH
}]
[enum] At this point the checkout should be in the same state as at
the end of point (3) above, because we resolved any issues with
the trunk already. Thus a simple
[example {
|
| |
21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 |
[enum] Validate the checkout again. The incoming trunk changes may
have broken something now. Do any required fixes.
[enum] Now merge to the trunk using
[example {
fossil update trunk
fossil merge --integrate YOUR_BRANCH
}]
[enum] At this point the checkout should be in the same state as at
the end of point (3) above, because we resolved any issues with
the trunk already. Thus a simple
[example {
|
Changes to devdoc/parts/d_op_branch_open.inc.
51 52 53 54 55 56 57 58 59 |
[para] We may forget to use [option {--branch NAME_OF_NEW_BRANCH}] and
then have to correct that oversight via the fossil web
interface (I am currently unaware of ways of doing such from
the command line, although some magic incantantion of
[cmd {fossil tag create}] may work).
[para] It helps tp keep awareness, like checking before any commit
that we are on the desired branch.
|
| |
51 52 53 54 55 56 57 58 59 |
[para] We may forget to use [option {--branch NAME_OF_NEW_BRANCH}] and
then have to correct that oversight via the fossil web
interface (I am currently unaware of ways of doing such from
the command line, although some magic incantantion of
[cmd {fossil tag create}] may work).
[para] It helps to keep awareness, like checking before any commit
that we are on the desired branch.
|
Changes to embedded/md/tcllib/files/devdoc/tcllib_devguide.md.
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
...
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
|
hidden until we commit to make our first commit\.
We may forget to use __\-\-branch NAME\_OF\_NEW\_BRANCH__ and then have to
correct that oversight via the fossil web interface \(I am currently unaware
of ways of doing such from the command line, although some magic
incantantion of __fossil tag create__ may work\)\.
It helps tp keep awareness, like checking before any commit that we are on
the desired branch\.
- *Merging a branch into trunk*
Be aware of where you are \(see first definition\)\.
Ensure that you have clean checkout \(see second definition\)\. In the
................................................................................
1. Validate the checkout again\. The incoming trunk changes may have broken
something now\. Do any required fixes\.
1. Now merge to the trunk using
fossil update trunk
fossil merge --integrate YOU_BRANCH
1. At this point the checkout should be in the same state as at the end of
point \(3\) above, because we resolved any issues with the trunk already\.
Thus a simple
fossil commit ...
|
|
|
|
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
...
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
|
hidden until we commit to make our first commit\.
We may forget to use __\-\-branch NAME\_OF\_NEW\_BRANCH__ and then have to
correct that oversight via the fossil web interface \(I am currently unaware
of ways of doing such from the command line, although some magic
incantantion of __fossil tag create__ may work\)\.
It helps to keep awareness, like checking before any commit that we are on
the desired branch\.
- *Merging a branch into trunk*
Be aware of where you are \(see first definition\)\.
Ensure that you have clean checkout \(see second definition\)\. In the
................................................................................
1. Validate the checkout again\. The incoming trunk changes may have broken
something now\. Do any required fixes\.
1. Now merge to the trunk using
fossil update trunk
fossil merge --integrate YOUR_BRANCH
1. At this point the checkout should be in the same state as at the end of
point \(3\) above, because we resolved any issues with the trunk already\.
Thus a simple
fossil commit ...
|
Changes to idoc/man/files/devdoc/tcllib_devguide.n.
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
...
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
|
.sp We may forget to use \fB--branch NAME_OF_NEW_BRANCH\fR and then have to correct that oversight via the fossil web interface (I am currently unaware of ways of doing such from the command line, although some magic incantantion of \fBfossil tag create\fR may work)\&. .sp It helps tp keep awareness, like checking before any commit that we are on the desired branch\&. .TP \fIMerging a branch into trunk\fR Be aware of where you are (see first definition)\&. .sp Ensure that you have clean checkout (see second definition)\&. In the full-blown sequence (zig-zag) it is \fIrequired\fR, due ................................................................................ have broken something now\&. Do any required fixes\&. .IP [4] Now merge to the trunk using .CS fossil update trunk fossil merge --integrate YOU_BRANCH .CE .IP [5] At this point the checkout should be in the same state as at the end of point (3) above, because we resolved any issues with the trunk already\&. Thus a simple .CS |
|
|
|
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
...
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
|
.sp We may forget to use \fB--branch NAME_OF_NEW_BRANCH\fR and then have to correct that oversight via the fossil web interface (I am currently unaware of ways of doing such from the command line, although some magic incantantion of \fBfossil tag create\fR may work)\&. .sp It helps to keep awareness, like checking before any commit that we are on the desired branch\&. .TP \fIMerging a branch into trunk\fR Be aware of where you are (see first definition)\&. .sp Ensure that you have clean checkout (see second definition)\&. In the full-blown sequence (zig-zag) it is \fIrequired\fR, due ................................................................................ have broken something now\&. Do any required fixes\&. .IP [4] Now merge to the trunk using .CS fossil update trunk fossil merge --integrate YOUR_BRANCH .CE .IP [5] At this point the checkout should be in the same state as at the end of point (3) above, because we resolved any issues with the trunk already\&. Thus a simple .CS |
Changes to idoc/www/tcllib/files/devdoc/tcllib_devguide.html.
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
...
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
|
developed. The work is hidden until we commit to make our first
commit.</p>
<p>We may forget to use <b class="option">--branch NAME_OF_NEW_BRANCH</b> and
then have to correct that oversight via the fossil web
interface (I am currently unaware of ways of doing such from
the command line, although some magic incantantion of
<b class="cmd">fossil tag create</b> may work).</p>
<p>It helps tp keep awareness, like checking before any commit
that we are on the desired branch.</p></dd>
<dt><em>Merging a branch into trunk</em></dt>
<dd><p>Be aware of where you are (see first definition).</p>
<p>Ensure that you have clean checkout (see second definition).
In the full-blown sequence (zig-zag) it is <em>required</em>, due
to the merging from trunk. In the shorter sequence it is only
desired. That said, keeping the checkout clean before
................................................................................
have cropped up.</p></li>
<li><p>Merge the latest state of the <i class="term">trunk</i> (see next definition).</p></li>
<li><p>Validate the checkout again. The incoming trunk changes may
have broken something now. Do any required fixes.</p></li>
<li><p>Now merge to the trunk using</p>
<pre class="doctools_example">
fossil update trunk
fossil merge --integrate YOU_BRANCH
</pre>
</li>
<li><p>At this point the checkout should be in the same state as at
the end of point (3) above, because we resolved any issues with
the trunk already. Thus a simple</p>
<pre class="doctools_example">
fossil commit ...
|
|
|
|
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
...
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
|
developed. The work is hidden until we commit to make our first
commit.</p>
<p>We may forget to use <b class="option">--branch NAME_OF_NEW_BRANCH</b> and
then have to correct that oversight via the fossil web
interface (I am currently unaware of ways of doing such from
the command line, although some magic incantantion of
<b class="cmd">fossil tag create</b> may work).</p>
<p>It helps to keep awareness, like checking before any commit
that we are on the desired branch.</p></dd>
<dt><em>Merging a branch into trunk</em></dt>
<dd><p>Be aware of where you are (see first definition).</p>
<p>Ensure that you have clean checkout (see second definition).
In the full-blown sequence (zig-zag) it is <em>required</em>, due
to the merging from trunk. In the shorter sequence it is only
desired. That said, keeping the checkout clean before
................................................................................
have cropped up.</p></li>
<li><p>Merge the latest state of the <i class="term">trunk</i> (see next definition).</p></li>
<li><p>Validate the checkout again. The incoming trunk changes may
have broken something now. Do any required fixes.</p></li>
<li><p>Now merge to the trunk using</p>
<pre class="doctools_example">
fossil update trunk
fossil merge --integrate YOUR_BRANCH
</pre>
</li>
<li><p>At this point the checkout should be in the same state as at
the end of point (3) above, because we resolved any issues with
the trunk already. Thus a simple</p>
<pre class="doctools_example">
fossil commit ...
|