Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Minor spelling correction. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | sync-forkwarn |
| Files: | files | file ages | folders |
| SHA1: |
76cd08baf6eac20d7f5c59e9bbd290f2 |
| User & Date: | andybradford 2015-04-27 14:39:37 |
Context
|
2015-04-27
| ||
| 19:14 | merge trunk check-in: 2dc4d98e user: jan.nijtmans tags: sync-forkwarn | |
| 14:39 | Minor spelling correction. check-in: 76cd08ba user: andybradford tags: sync-forkwarn | |
|
2015-04-26
| ||
| 17:26 | Another "fork" -> "ambigeous branch" change check-in: fe7f6f3c user: jan.nijtmans tags: sync-forkwarn | |
Changes
Changes to src/checkin.c.
2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 |
}
db_end_transaction(0);
if( !g.markPrivate ){
autosync_loop(SYNC_PUSH|SYNC_PULL, db_get_int("autosync-tries", 1));
}
if( count_nonbranch_children(vid)>1 ){
fossil_print("**** warning: an ambigeous branch has occurred *****\n");
}
}
|
| |
2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 |
}
db_end_transaction(0);
if( !g.markPrivate ){
autosync_loop(SYNC_PUSH|SYNC_PULL, db_get_int("autosync-tries", 1));
}
if( count_nonbranch_children(vid)>1 ){
fossil_print("**** warning: an ambiguous branch has occurred *****\n");
}
}
|
Changes to src/descendants.c.
427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 |
z = mprintf("%s [%S] %s", zDate, zId, zCom);
comment_print(z, zCom, 7, width, g.comFmtFlags);
fossil_free(z);
}
}
fossil_free(zLastBr);
db_finalize(&q);
if( showForks && !zLastBr ) fossil_print("*** OK, no ambigeous branch found ***\n");
}
/*
** WEBPAGE: leaves
**
** Find leaves of all branches.
*/
|
| |
427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 |
z = mprintf("%s [%S] %s", zDate, zId, zCom);
comment_print(z, zCom, 7, width, g.comFmtFlags);
fossil_free(z);
}
}
fossil_free(zLastBr);
db_finalize(&q);
if( showForks && !zLastBr ) fossil_print("*** OK, no ambiguous branch found ***\n");
}
/*
** WEBPAGE: leaves
**
** Find leaves of all branches.
*/
|
Changes to src/info.c.
242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 |
int rid;
rid = name_to_rid(g.argv[2]);
if( rid==0 ){
fossil_fatal("no such object: %s\n", g.argv[2]);
}
show_common_info(rid, "uuid:", 1, 1);
}
fossil_print("ambigeous branches:\n");
leaves_cmd();
}
/*
** Show information about all tags on a given check-in.
*/
static void showTags(int rid){
|
| |
242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 |
int rid;
rid = name_to_rid(g.argv[2]);
if( rid==0 ){
fossil_fatal("no such object: %s\n", g.argv[2]);
}
show_common_info(rid, "uuid:", 1, 1);
}
fossil_print("ambiguous branches:\n");
leaves_cmd();
}
/*
** Show information about all tags on a given check-in.
*/
static void showTags(int rid){
|
Changes to src/update.c.
560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 |
fossil_warning("WARNING: %d unmanaged files were overwritten",
nOverwrite);
}
if( nMerge ){
fossil_warning("WARNING: %d uncommitted prior merges", nMerge);
}
if( isFork ){
fossil_warning("WARNING: ambigeous branch, please do a \"fossil merge\"");
}
}
/*
** Clean up the mid and pid VFILE entries. Then commit the changes.
*/
if( dryRunFlag ){
|
| |
560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 |
fossil_warning("WARNING: %d unmanaged files were overwritten",
nOverwrite);
}
if( nMerge ){
fossil_warning("WARNING: %d uncommitted prior merges", nMerge);
}
if( isFork ){
fossil_warning("WARNING: ambiguous branch, please do a \"fossil merge\"");
}
}
/*
** Clean up the mid and pid VFILE entries. Then commit the changes.
*/
if( dryRunFlag ){
|
Changes to src/xfer.c.
1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 |
if( nErr && go==2 ){
db_multi_exec("DROP TABLE onremote");
manifest_crosslink_end(MC_PERMIT_HOOKS);
content_enable_dephantomize(1);
db_end_transaction(0);
}
if( (syncFlags & SYNC_CLONE)==0 && fossil_any_has_fork(g.rcvid) ){
fossil_warning("***** WARNING: an ambigeous branch has occurred *****\n"
"Use \"fossil info\" for more details.");
}
return nErr;
}
|
| |
1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 |
if( nErr && go==2 ){
db_multi_exec("DROP TABLE onremote");
manifest_crosslink_end(MC_PERMIT_HOOKS);
content_enable_dephantomize(1);
db_end_transaction(0);
}
if( (syncFlags & SYNC_CLONE)==0 && fossil_any_has_fork(g.rcvid) ){
fossil_warning("***** WARNING: an ambiguous branch has occurred *****\n"
"Use \"fossil info\" for more details.");
}
return nErr;
}
|