Fossil SCM

Document some more options of fossil branch new: --nosign, --user-override and --date-override. Fix a typo in fossil branch ls docco.

martin.weber 2012-04-16 15:53 trunk
Commit 7727eb12b02e495fa3c356d0c4c13df3a5a5c72f
Parent 4290a801a095aa8…
1 file changed +12 -8
~ src/branch.c
M src/branch.c
+12 -8
--- src/branch.c
+++ src/branch.c
@@ -20,12 +20,12 @@
2020
 #include "config.h"
2121
 #include "branch.h"
2222
 #include <assert.h>
2323
2424
 /*
25
-** fossil branch new BRANCH-NAME ?ORIGIN-CHECK-IN? ?-bgcolor COLOR?
26
-** argv0 argv1 argv2 argv3 argv4
25
+** fossil branch new NAME BASIS ?OPTIONS?
26
+** argv0 argv1 argv2 argv3 argv4
2727
 */
2828
 void branch_new(void){
2929
 int rootid; /* RID of the root check-in - what we branch off of */
3030
 int brid; /* RID of the branch check-in */
3131
 int noSign; /* True if the branch is unsigned */
@@ -48,11 +48,11 @@
4848
 isPrivate = find_option("private",0,0)!=0;
4949
 zDateOvrd = find_option("date-override",0,1);
5050
 zUserOvrd = find_option("user-override",0,1);
5151
 verify_all_options();
5252
 if( g.argc<5 ){
53
- usage("new BRANCH-NAME CHECK-IN ?-bgcolor COLOR?");
53
+ usage("new BRANCH-NAME BASIS ?OPTIONS?");
5454
 }
5555
 db_find_and_open_repository(0, 0);
5656
 noSign = db_get_int("omitsign", 0)|noSign;
5757
5858
 /* fossil branch new name */
@@ -226,18 +226,22 @@
226226
 ** Usage: %fossil branch SUBCOMMAND ... ?OPTIONS?
227227
 **
228228
 ** Run various subcommands to manage branches of the open repository or
229229
 ** of the repository identified by the -R or --repository option.
230230
 **
231
-** %fossil branch new BRANCH-NAME BASIS ?--bgcolor COLOR? ?--private?
231
+** %fossil branch new BRANCH-NAME BASIS ?OPTIONS?
232232
 **
233233
 ** Create a new branch BRANCH-NAME off of check-in BASIS.
234
-** You can optionally give the branch a default color. The
235
-** --private option makes the branch private.
234
+** Supported options for this subcommand include:
235
+** --private branch is private (i.e., remains local)
236
+** --bgcolor COLOR use COLOR instead of automatic background
237
+** --nosign do not sign contents on this branch
238
+** --date-override DATE DATE to use instead of 'now'
239
+** --user-override USER USER to use instead of the current default
236240
 **
237
-** %fossil branch list ?-all | --closed?
238
-** %fossil branch ls ?-all | --closed?
241
+** %fossil branch list ?--all | --closed?
242
+** %fossil branch ls ?--all | --closed?
239243
 **
240244
 ** List all branches. Use --all or --closed to list all branches
241245
 ** or closed branches. The default is to show only open branches.
242246
 **
243247
 ** Options:
244248
--- src/branch.c
+++ src/branch.c
@@ -20,12 +20,12 @@
20 #include "config.h"
21 #include "branch.h"
22 #include <assert.h>
23
24 /*
25 ** fossil branch new BRANCH-NAME ?ORIGIN-CHECK-IN? ?-bgcolor COLOR?
26 ** argv0 argv1 argv2 argv3 argv4
27 */
28 void branch_new(void){
29 int rootid; /* RID of the root check-in - what we branch off of */
30 int brid; /* RID of the branch check-in */
31 int noSign; /* True if the branch is unsigned */
@@ -48,11 +48,11 @@
48 isPrivate = find_option("private",0,0)!=0;
49 zDateOvrd = find_option("date-override",0,1);
50 zUserOvrd = find_option("user-override",0,1);
51 verify_all_options();
52 if( g.argc<5 ){
53 usage("new BRANCH-NAME CHECK-IN ?-bgcolor COLOR?");
54 }
55 db_find_and_open_repository(0, 0);
56 noSign = db_get_int("omitsign", 0)|noSign;
57
58 /* fossil branch new name */
@@ -226,18 +226,22 @@
226 ** Usage: %fossil branch SUBCOMMAND ... ?OPTIONS?
227 **
228 ** Run various subcommands to manage branches of the open repository or
229 ** of the repository identified by the -R or --repository option.
230 **
231 ** %fossil branch new BRANCH-NAME BASIS ?--bgcolor COLOR? ?--private?
232 **
233 ** Create a new branch BRANCH-NAME off of check-in BASIS.
234 ** You can optionally give the branch a default color. The
235 ** --private option makes the branch private.
 
 
 
 
236 **
237 ** %fossil branch list ?-all | --closed?
238 ** %fossil branch ls ?-all | --closed?
239 **
240 ** List all branches. Use --all or --closed to list all branches
241 ** or closed branches. The default is to show only open branches.
242 **
243 ** Options:
244
--- src/branch.c
+++ src/branch.c
@@ -20,12 +20,12 @@
20 #include "config.h"
21 #include "branch.h"
22 #include <assert.h>
23
24 /*
25 ** fossil branch new NAME BASIS ?OPTIONS?
26 ** argv0 argv1 argv2 argv3 argv4
27 */
28 void branch_new(void){
29 int rootid; /* RID of the root check-in - what we branch off of */
30 int brid; /* RID of the branch check-in */
31 int noSign; /* True if the branch is unsigned */
@@ -48,11 +48,11 @@
48 isPrivate = find_option("private",0,0)!=0;
49 zDateOvrd = find_option("date-override",0,1);
50 zUserOvrd = find_option("user-override",0,1);
51 verify_all_options();
52 if( g.argc<5 ){
53 usage("new BRANCH-NAME BASIS ?OPTIONS?");
54 }
55 db_find_and_open_repository(0, 0);
56 noSign = db_get_int("omitsign", 0)|noSign;
57
58 /* fossil branch new name */
@@ -226,18 +226,22 @@
226 ** Usage: %fossil branch SUBCOMMAND ... ?OPTIONS?
227 **
228 ** Run various subcommands to manage branches of the open repository or
229 ** of the repository identified by the -R or --repository option.
230 **
231 ** %fossil branch new BRANCH-NAME BASIS ?OPTIONS?
232 **
233 ** Create a new branch BRANCH-NAME off of check-in BASIS.
234 ** Supported options for this subcommand include:
235 ** --private branch is private (i.e., remains local)
236 ** --bgcolor COLOR use COLOR instead of automatic background
237 ** --nosign do not sign contents on this branch
238 ** --date-override DATE DATE to use instead of 'now'
239 ** --user-override USER USER to use instead of the current default
240 **
241 ** %fossil branch list ?--all | --closed?
242 ** %fossil branch ls ?--all | --closed?
243 **
244 ** List all branches. Use --all or --closed to list all branches
245 ** or closed branches. The default is to show only open branches.
246 **
247 ** Options:
248

Keyboard Shortcuts

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