Fossil SCM

Minor spelling correction.

andybradford 2015-04-27 14:39 sync-forkwarn
Commit 76cd08baf6eac20d7f5c59e9bbd290f2ec33170e
Parent fe7f6f3cc19953d…
5 files changed +1 -1 +1 -1 +1 -1 +1 -1 +1 -1
~ src/checkin.c ~ src/descendants.c ~ src/info.c ~ src/update.c ~ src/xfer.c
M src/checkin.c
+1 -1
--- src/checkin.c
+++ src/checkin.c
@@ -2118,8 +2118,8 @@
21182118
21192119
 if( !g.markPrivate ){
21202120
 autosync_loop(SYNC_PUSH|SYNC_PULL, db_get_int("autosync-tries", 1));
21212121
 }
21222122
 if( count_nonbranch_children(vid)>1 ){
2123
- fossil_print("**** warning: an ambigeous branch has occurred *****\n");
2123
+ fossil_print("**** warning: an ambiguous branch has occurred *****\n");
21242124
 }
21252125
 }
21262126
--- src/checkin.c
+++ src/checkin.c
@@ -2118,8 +2118,8 @@
2118
2119 if( !g.markPrivate ){
2120 autosync_loop(SYNC_PUSH|SYNC_PULL, db_get_int("autosync-tries", 1));
2121 }
2122 if( count_nonbranch_children(vid)>1 ){
2123 fossil_print("**** warning: an ambigeous branch has occurred *****\n");
2124 }
2125 }
2126
--- src/checkin.c
+++ src/checkin.c
@@ -2118,8 +2118,8 @@
2118
2119 if( !g.markPrivate ){
2120 autosync_loop(SYNC_PUSH|SYNC_PULL, db_get_int("autosync-tries", 1));
2121 }
2122 if( count_nonbranch_children(vid)>1 ){
2123 fossil_print("**** warning: an ambiguous branch has occurred *****\n");
2124 }
2125 }
2126
M src/descendants.c
+1 -1
--- src/descendants.c
+++ src/descendants.c
@@ -429,11 +429,11 @@
429429
 fossil_free(z);
430430
 }
431431
 }
432432
 fossil_free(zLastBr);
433433
 db_finalize(&q);
434
- if( showForks && !zLastBr ) fossil_print("*** OK, no ambigeous branch found ***\n");
434
+ if( showForks && !zLastBr ) fossil_print("*** OK, no ambiguous branch found ***\n");
435435
 }
436436
437437
 /*
438438
 ** WEBPAGE: leaves
439439
 **
440440
--- src/descendants.c
+++ src/descendants.c
@@ -429,11 +429,11 @@
429 fossil_free(z);
430 }
431 }
432 fossil_free(zLastBr);
433 db_finalize(&q);
434 if( showForks && !zLastBr ) fossil_print("*** OK, no ambigeous branch found ***\n");
435 }
436
437 /*
438 ** WEBPAGE: leaves
439 **
440
--- src/descendants.c
+++ src/descendants.c
@@ -429,11 +429,11 @@
429 fossil_free(z);
430 }
431 }
432 fossil_free(zLastBr);
433 db_finalize(&q);
434 if( showForks && !zLastBr ) fossil_print("*** OK, no ambiguous branch found ***\n");
435 }
436
437 /*
438 ** WEBPAGE: leaves
439 **
440
M src/info.c
+1 -1
--- src/info.c
+++ src/info.c
@@ -244,11 +244,11 @@
244244
 if( rid==0 ){
245245
 fossil_fatal("no such object: %s\n", g.argv[2]);
246246
 }
247247
 show_common_info(rid, "uuid:", 1, 1);
248248
 }
249
- fossil_print("ambigeous branches:\n");
249
+ fossil_print("ambiguous branches:\n");
250250
 leaves_cmd();
251251
 }
252252
253253
 /*
254254
 ** Show information about all tags on a given check-in.
255255
--- src/info.c
+++ src/info.c
@@ -244,11 +244,11 @@
244 if( rid==0 ){
245 fossil_fatal("no such object: %s\n", g.argv[2]);
246 }
247 show_common_info(rid, "uuid:", 1, 1);
248 }
249 fossil_print("ambigeous branches:\n");
250 leaves_cmd();
251 }
252
253 /*
254 ** Show information about all tags on a given check-in.
255
--- src/info.c
+++ src/info.c
@@ -244,11 +244,11 @@
244 if( rid==0 ){
245 fossil_fatal("no such object: %s\n", g.argv[2]);
246 }
247 show_common_info(rid, "uuid:", 1, 1);
248 }
249 fossil_print("ambiguous branches:\n");
250 leaves_cmd();
251 }
252
253 /*
254 ** Show information about all tags on a given check-in.
255
M src/update.c
+1 -1
--- src/update.c
+++ src/update.c
@@ -562,11 +562,11 @@
562562
 }
563563
 if( nMerge ){
564564
 fossil_warning("WARNING: %d uncommitted prior merges", nMerge);
565565
 }
566566
 if( isFork ){
567
- fossil_warning("WARNING: ambigeous branch, please do a \"fossil merge\"");
567
+ fossil_warning("WARNING: ambiguous branch, please do a \"fossil merge\"");
568568
 }
569569
 }
570570
571571
 /*
572572
 ** Clean up the mid and pid VFILE entries. Then commit the changes.
573573
--- src/update.c
+++ src/update.c
@@ -562,11 +562,11 @@
562 }
563 if( nMerge ){
564 fossil_warning("WARNING: %d uncommitted prior merges", nMerge);
565 }
566 if( isFork ){
567 fossil_warning("WARNING: ambigeous branch, please do a \"fossil merge\"");
568 }
569 }
570
571 /*
572 ** Clean up the mid and pid VFILE entries. Then commit the changes.
573
--- src/update.c
+++ src/update.c
@@ -562,11 +562,11 @@
562 }
563 if( nMerge ){
564 fossil_warning("WARNING: %d uncommitted prior merges", nMerge);
565 }
566 if( isFork ){
567 fossil_warning("WARNING: ambiguous branch, please do a \"fossil merge\"");
568 }
569 }
570
571 /*
572 ** Clean up the mid and pid VFILE entries. Then commit the changes.
573
M src/xfer.c
+1 -1
--- src/xfer.c
+++ src/xfer.c
@@ -1973,10 +1973,10 @@
19731973
 manifest_crosslink_end(MC_PERMIT_HOOKS);
19741974
 content_enable_dephantomize(1);
19751975
 db_end_transaction(0);
19761976
 }
19771977
 if( (syncFlags & SYNC_CLONE)==0 && fossil_any_has_fork(g.rcvid) ){
1978
- fossil_warning("***** WARNING: an ambigeous branch has occurred *****\n"
1978
+ fossil_warning("***** WARNING: an ambiguous branch has occurred *****\n"
19791979
 "Use \"fossil info\" for more details.");
19801980
 }
19811981
 return nErr;
19821982
 }
19831983
--- src/xfer.c
+++ src/xfer.c
@@ -1973,10 +1973,10 @@
1973 manifest_crosslink_end(MC_PERMIT_HOOKS);
1974 content_enable_dephantomize(1);
1975 db_end_transaction(0);
1976 }
1977 if( (syncFlags & SYNC_CLONE)==0 && fossil_any_has_fork(g.rcvid) ){
1978 fossil_warning("***** WARNING: an ambigeous branch has occurred *****\n"
1979 "Use \"fossil info\" for more details.");
1980 }
1981 return nErr;
1982 }
1983
--- src/xfer.c
+++ src/xfer.c
@@ -1973,10 +1973,10 @@
1973 manifest_crosslink_end(MC_PERMIT_HOOKS);
1974 content_enable_dephantomize(1);
1975 db_end_transaction(0);
1976 }
1977 if( (syncFlags & SYNC_CLONE)==0 && fossil_any_has_fork(g.rcvid) ){
1978 fossil_warning("***** WARNING: an ambiguous branch has occurred *****\n"
1979 "Use \"fossil info\" for more details.");
1980 }
1981 return nErr;
1982 }
1983

Keyboard Shortcuts

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