Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix typo in warning message. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
c80ee413ab77fb46b01c68ea82e2ad9a |
| User & Date: | drh 2011-10-17 23:12:59.461 |
Context
|
2011-10-18
| ||
| 23:37 | When editing the properties of a check-in and comparing the old and new comment text, ignore leading and trailing whitespace and the differences between \r\n and \n. Hopefully this will reduce the number of unwanted comment edits. check-in: 48928829e2 user: drh tags: trunk | |
| 20:55 | Adding a boolean setting to choose the use of 'targets' in the anchors href. Default enabled. Related to the thread starting at [http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg06588.html] check-in: d29df2f0a2 user: viriketo tags: targets_setting | |
| 19:49 | Bringing the changes I had in [4bae75a08e] to a trunk-derived branch. check-in: ef5d2176f9 user: viriketo tags: annotate_links | |
| 19:45 | Should fix ticket [f0f9aff371f2]. Until now, the annotate_cmd was taking the last (or any?) checkin that had the artifact to be annotated, totally unrelated to what version is checked out. I made annotate_cmd respect the checkout, and annotate only from the past until the checked out version. This makes the command slower, but at least does what I'd like it to do. Maybe someone else can come up with a faster or simpler implementation. I changed the compute_direct_ancestors code so I could call it twice in a single run. Closed-Leaf check-in: c7c4279f13 user: viriketo tags: annotatecmd_fix | |
|
2011-10-17
| ||
| 23:12 | Fix typo in warning message. check-in: c80ee413ab user: drh tags: trunk | |
| 16:01 | Fixed an incorrect const qualifier (caught by clang). check-in: fda7c2c63d user: stephan tags: trunk | |
Changes
Changes to src/merge.c.
| ︙ | ︙ | |||
507 508 509 510 511 512 513 |
/* Report on conflicts
*/
if( !nochangeFlag ){
if( nConflict ){
fossil_print("WARNING: %d merge conflicts", nConflict);
}
if( nOverwrite ){
| | | 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 |
/* Report on conflicts
*/
if( !nochangeFlag ){
if( nConflict ){
fossil_print("WARNING: %d merge conflicts", nConflict);
}
if( nOverwrite ){
fossil_warning("WARNING: %d unmanaged files were overwritten",
nOverwrite);
}
}
/*
** Clean up the mid and pid VFILE entries. Then commit the changes.
*/
|
| ︙ | ︙ |
Changes to src/update.c.
| ︙ | ︙ | |||
463 464 465 466 467 468 469 |
internalConflictCnt = nConflict;
nConflict = 0;
}else{
fossil_print("WARNING: %d merge conflicts", nConflict);
}
}
if( nOverwrite ){
| | | 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 |
internalConflictCnt = nConflict;
nConflict = 0;
}else{
fossil_print("WARNING: %d merge conflicts", nConflict);
}
}
if( nOverwrite ){
fossil_warning("WARNING: %d unmanaged files were overwritten",
nOverwrite);
}
}
/*
** Clean up the mid and pid VFILE entries. Then commit the changes.
*/
|
| ︙ | ︙ |