Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Remote the number of merge conflicts on an update. Ticket [769b4ed7b23e4cb7] |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
0b8aed945e5caf54c80b5a6fc09709b1 |
| User & Date: | drh 2011-01-18 18:36:08.141 |
Context
|
2011-01-18
| ||
| 18:36 | Call vfile_check_signature before creating a stash, to make sure that all changed files have been stashed. Ticket [bfef8e4f89cd4b161a584] check-in: a435ae67a9 user: drh tags: trunk | |
| 18:36 | Remote the number of merge conflicts on an update. Ticket [769b4ed7b23e4cb7] check-in: 0b8aed945e user: drh tags: trunk | |
| 14:43 | Improved hyperlinking in the RSS feed. check-in: 66d93f33d5 user: drh tags: trunk | |
Changes
Changes to src/update.c.
| ︙ | ︙ | |||
404 405 406 407 408 409 410 |
/* Report on conflicts
*/
if( nConflict && !nochangeFlag ){
if( internalUpdate ){
internalConflictCnt = nConflict;
}else{
| | > | 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 |
/* Report on conflicts
*/
if( nConflict && !nochangeFlag ){
if( internalUpdate ){
internalConflictCnt = nConflict;
}else{
printf("WARNING: %d merge conflicts - see messages above for details.\n",
nConflict);
}
}
/*
** Clean up the mid and pid VFILE entries. Then commit the changes.
*/
if( nochangeFlag ){
|
| ︙ | ︙ |