Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Skip diff for files that are ADDED_BY_INTEGRATE. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
a6b999ce131c0f17c4c1e3350f5aa97d |
| User & Date: | mistachkin 2015-10-26 01:18:10 |
Context
|
2015-10-26
| ||
| 18:00 | Automatically pull before running the "fossil merge" command, in case there have been new check-ins to the branch being merged. ... (check-in: 16501a04 user: drh tags: trunk) | |
| 01:18 | Skip diff for files that are ADDED_BY_INTEGRATE. ... (check-in: a6b999ce user: mistachkin tags: trunk) | |
|
2015-10-24
| ||
| 14:10 | Fix "json timeline" to don't show duplicate files in some chek-ins with merge. Same way CLI timeline was fix on [3c34db8d]. ... (check-in: 26d903de user: mgagnon tags: trunk) | |
Changes
Changes to src/diffcmd.c.
| ︙ | ︙ | |||
398 399 400 401 402 403 404 405 406 407 408 409 410 411 |
}else if( isNew ){
fossil_print("ADDED %s\n", zPathname);
srcid = 0;
if( !asNewFile ){ showDiff = 0; }
}else if( isChnged==3 ){
fossil_print("ADDED_BY_MERGE %s\n", zPathname);
srcid = 0;
if( !asNewFile ){ showDiff = 0; }
}
if( showDiff ){
Blob content;
int isBin;
if( !isLink != !file_wd_islink(zFullName) ){
diff_print_index(zPathname, diffFlags);
| > > > > | 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 |
}else if( isNew ){
fossil_print("ADDED %s\n", zPathname);
srcid = 0;
if( !asNewFile ){ showDiff = 0; }
}else if( isChnged==3 ){
fossil_print("ADDED_BY_MERGE %s\n", zPathname);
srcid = 0;
if( !asNewFile ){ showDiff = 0; }
}else if( isChnged==5 ){
fossil_print("ADDED_BY_INTEGRATE %s\n", zPathname);
srcid = 0;
if( !asNewFile ){ showDiff = 0; }
}
if( showDiff ){
Blob content;
int isBin;
if( !isLink != !file_wd_islink(zFullName) ){
diff_print_index(zPathname, diffFlags);
|
| ︙ | ︙ |