Differences From Artifact [2f07b299aa]:
- File src/update.c — part of check-in [76e77aba29] at 2015-02-27 13:36:30 on branch trunk — Remove wordy side bars from two obscure pages. Change "Checkin" to "Check-in" on generated pages. Fix a typo on the webpage-ex.md documentation page. (user: drh size: 28163) [more...]
To Artifact [9f50f85206]:
- File src/update.c — part of check-in [32998a20f9] at 2015-04-10 07:55:02 on branch update-fork-warn — Add a warning to "fossil update" when a fork has occurred. (user: jan.nijtmans size: 28288)
| ︙ | |||
558 559 560 561 562 563 564 565 566 567 568 569 570 571 | 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 | + + + |
if( nOverwrite ){
fossil_warning("WARNING: %d unmanaged files were overwritten",
nOverwrite);
}
if( nMerge ){
fossil_warning("WARNING: %d uncommitted prior merges", nMerge);
}
if( fossil_find_nearest_fork(tid) ){
fossil_warning("WARNING: fork detected, please do a \"fossil merge\"");
}
}
/*
** Clean up the mid and pid VFILE entries. Then commit the changes.
*/
if( dryRunFlag ){
db_end_transaction(1); /* With --dry-run, rollback changes */
|
| ︙ |