Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch sync-forkwarn Excluding Merge-Ins
This is equivalent to a diff from a3c6971a1b to 7699d14104
|
2015-05-30
| ||
| 21:51 | Update the changes file. check-in: 53be87d7d7 user: mistachkin tags: trunk | |
| 08:53 | merge trunk Leaf check-in: 7699d14104 user: jan.nijtmans tags: sync-forkwarn | |
| 04:15 | Fix one-character typo in changelog. check-in: a3c6971a1b user: andygoth tags: trunk | |
|
2015-05-29
| ||
| 17:52 | Update the built-in SQLite to 3.8.11 alpha. check-in: 2b1261a59e user: drh tags: trunk | |
|
2015-05-20
| ||
| 11:45 | Merge trunk check-in: 9f507ffe49 user: jan.nijtmans tags: sync-forkwarn | |
Changes to src/descendants.c.
| ︙ | ︙ | |||
349 350 351 352 353 354 355 |
*/
void leaves_cmd(void){
Stmt q;
Blob sql;
int showAll = find_option("all", "a", 0)!=0;
int showClosed = find_option("closed", "c", 0)!=0;
int recomputeFlag = find_option("recompute",0,0)!=0;
| | | > < | 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 |
*/
void leaves_cmd(void){
Stmt q;
Blob sql;
int showAll = find_option("all", "a", 0)!=0;
int showClosed = find_option("closed", "c", 0)!=0;
int recomputeFlag = find_option("recompute",0,0)!=0;
int showForks = g.argv[1][0]!='l';
int multipleFlag = (find_option("multiple","m",0))!=0 || showForks;
int byBranch = (find_option("bybranch",0,0)!=0) || multipleFlag;
const char *zWidth = find_option("width","W",1);
char *zLastBr = 0;
int n, width;
char zLineNo[10];
if( zWidth ){
width = atoi(zWidth);
if( (width!=0) && (width<=39) ){
fossil_fatal("-W|--width value must be >39 or 0");
}
}else{
width = -1;
|
| ︙ | ︙ | |||
427 428 429 430 431 432 433 434 435 436 437 438 439 440 |
const char *zId = db_column_text(&q, 1);
const char *zDate = db_column_text(&q, 2);
const char *zCom = db_column_text(&q, 3);
const char *zBr = db_column_text(&q, 7);
char *z;
if( byBranch && fossil_strcmp(zBr, zLastBr)!=0 ){
fossil_print("*** %s ***\n", zBr);
fossil_free(zLastBr);
zLastBr = fossil_strdup(zBr);
if( multipleFlag ) n = 0;
}
n++;
sqlite3_snprintf(sizeof(zLineNo), zLineNo, "(%d)", n);
| > > > > | 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 |
const char *zId = db_column_text(&q, 1);
const char *zDate = db_column_text(&q, 2);
const char *zCom = db_column_text(&q, 3);
const char *zBr = db_column_text(&q, 7);
char *z;
if( byBranch && fossil_strcmp(zBr, zLastBr)!=0 ){
if( showForks ){
fossil_print("WARNING: multiple open leaves on the following branches:\n");
showForks = 0;
}
fossil_print("*** %s ***\n", zBr);
fossil_free(zLastBr);
zLastBr = fossil_strdup(zBr);
if( multipleFlag ) n = 0;
}
n++;
sqlite3_snprintf(sizeof(zLineNo), zLineNo, "(%d)", n);
|
| ︙ | ︙ |
Changes to src/info.c.
| ︙ | ︙ | |||
220 221 222 223 224 225 226 227 228 229 230 231 232 233 |
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);
}
}
/*
** Show information about all tags on a given check-in.
*/
static void showTags(int rid){
Stmt q;
| > | 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 |
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);
}
leaves_cmd();
}
/*
** Show information about all tags on a given check-in.
*/
static void showTags(int rid){
Stmt q;
|
| ︙ | ︙ |
Changes to src/xfer.c.
| ︙ | ︙ | |||
1972 1973 1974 1975 1976 1977 1978 |
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 && g.rcvid && fossil_any_has_fork(g.rcvid) ){
fossil_warning("***** WARNING: a fork has occurred *****\n"
| | | 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 |
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 && g.rcvid && fossil_any_has_fork(g.rcvid) ){
fossil_warning("***** WARNING: a fork has occurred *****\n"
"use \"fossil info\" for more details.");
}
return nErr;
}
|