Fossil SCM

Slight alteration of branch renaming help text to clarify functionality based on discussion in [forum:45cdd8874ce1654a | forum post 45cdd8874ce1654a].

andybradford 2023-05-23 02:44 trunk
Commit e053682a4eb22338e3e653f37cba9f5b4d8663f64f8f3f68fa8618006d7a7830
1 file changed +2 -2
+2 -2
--- src/info.c
+++ src/info.c
@@ -3377,11 +3377,11 @@
33773377
}
33783378
@ <tr><th align="right" valign="top">Branching:</th>
33793379
@ <td valign="top">
33803380
@ <label><input id="newbr" type="checkbox" name="newbr" \
33813381
@ data-branch='%h(zBranchName)'%s(zNewBrFlag)>
3382
- @ Make this check-in the start of a new branch named:</label>
3382
+ @ Starting from this check-in, rename the branch to:</label>
33833383
@ <input id="brname" type="text" style="width:15;" name="brname" \
33843384
@ value="%h(zNewBranch)"></td></tr>
33853385
if( !fHasHidden ){
33863386
@ <tr><th align="right" valign="top">Branch Hiding:</th>
33873387
@ <td valign="top">
@@ -3477,11 +3477,11 @@
34773477
** --date DATETIME Make DATETIME the check-in time
34783478
** --bgcolor COLOR Apply COLOR to this check-in
34793479
** --branchcolor COLOR Apply and propagate COLOR to the branch
34803480
** --tag TAG Add new TAG to this check-in
34813481
** --cancel TAG Cancel TAG from this check-in
3482
-** --branch NAME Make this check-in the start of branch NAME
3482
+** --branch NAME Rename branch of check-in to NAME
34833483
** --hide Hide branch starting from this check-in
34843484
** --close Mark this "leaf" as closed
34853485
** -n|--dry-run Print control artifact, but make no changes
34863486
** --date-override DATETIME Set the change time on the control artifact
34873487
** --user-override USER Set the user name on the control artifact
34883488
--- src/info.c
+++ src/info.c
@@ -3377,11 +3377,11 @@
3377 }
3378 @ <tr><th align="right" valign="top">Branching:</th>
3379 @ <td valign="top">
3380 @ <label><input id="newbr" type="checkbox" name="newbr" \
3381 @ data-branch='%h(zBranchName)'%s(zNewBrFlag)>
3382 @ Make this check-in the start of a new branch named:</label>
3383 @ <input id="brname" type="text" style="width:15;" name="brname" \
3384 @ value="%h(zNewBranch)"></td></tr>
3385 if( !fHasHidden ){
3386 @ <tr><th align="right" valign="top">Branch Hiding:</th>
3387 @ <td valign="top">
@@ -3477,11 +3477,11 @@
3477 ** --date DATETIME Make DATETIME the check-in time
3478 ** --bgcolor COLOR Apply COLOR to this check-in
3479 ** --branchcolor COLOR Apply and propagate COLOR to the branch
3480 ** --tag TAG Add new TAG to this check-in
3481 ** --cancel TAG Cancel TAG from this check-in
3482 ** --branch NAME Make this check-in the start of branch NAME
3483 ** --hide Hide branch starting from this check-in
3484 ** --close Mark this "leaf" as closed
3485 ** -n|--dry-run Print control artifact, but make no changes
3486 ** --date-override DATETIME Set the change time on the control artifact
3487 ** --user-override USER Set the user name on the control artifact
3488
--- src/info.c
+++ src/info.c
@@ -3377,11 +3377,11 @@
3377 }
3378 @ <tr><th align="right" valign="top">Branching:</th>
3379 @ <td valign="top">
3380 @ <label><input id="newbr" type="checkbox" name="newbr" \
3381 @ data-branch='%h(zBranchName)'%s(zNewBrFlag)>
3382 @ Starting from this check-in, rename the branch to:</label>
3383 @ <input id="brname" type="text" style="width:15;" name="brname" \
3384 @ value="%h(zNewBranch)"></td></tr>
3385 if( !fHasHidden ){
3386 @ <tr><th align="right" valign="top">Branch Hiding:</th>
3387 @ <td valign="top">
@@ -3477,11 +3477,11 @@
3477 ** --date DATETIME Make DATETIME the check-in time
3478 ** --bgcolor COLOR Apply COLOR to this check-in
3479 ** --branchcolor COLOR Apply and propagate COLOR to the branch
3480 ** --tag TAG Add new TAG to this check-in
3481 ** --cancel TAG Cancel TAG from this check-in
3482 ** --branch NAME Rename branch of check-in to NAME
3483 ** --hide Hide branch starting from this check-in
3484 ** --close Mark this "leaf" as closed
3485 ** -n|--dry-run Print control artifact, but make no changes
3486 ** --date-override DATETIME Set the change time on the control artifact
3487 ** --user-override USER Set the user name on the control artifact
3488

Keyboard Shortcuts

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