Fossil SCM
Fix some over-length source code lines. No functional changes.
Commit
9a8d082701b4a2160f982047044e081c9fbb8a52
Parent
a1721621f6828f4…
1 file changed
+6
-4
+6
-4
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1348,13 +1348,13 @@ | ||
| 1348 | 1348 | ** Added files have mlink.pid=0. |
| 1349 | 1349 | ** File added by merge have mlink.pid=-1 |
| 1350 | 1350 | ** Edited files have both mlink.pid!=0 and mlink.fid!=0 |
| 1351 | 1351 | */ |
| 1352 | 1352 | static void add_mlink( |
| 1353 | - int pmid, Manifest *pParent, /* Parent check-in */ | |
| 1354 | - int mid, Manifest *pChild, /* The child check-in */ | |
| 1355 | - int isPrim /* TRUE if pmid is the primary parent of mid */ | |
| 1353 | + int pmid, Manifest *pParent, /* Parent check-in */ | |
| 1354 | + int mid, Manifest *pChild, /* The child check-in */ | |
| 1355 | + int isPrim /* TRUE if pmid is the primary parent of mid */ | |
| 1356 | 1356 | ){ |
| 1357 | 1357 | Blob otherContent; |
| 1358 | 1358 | int otherRid; |
| 1359 | 1359 | int i, rc; |
| 1360 | 1360 | ManifestFile *pChildFile, *pParentFile; |
| @@ -2110,11 +2110,13 @@ | ||
| 2110 | 2110 | continue; |
| 2111 | 2111 | }else if( strcmp(zName, "+date")==0 ){ |
| 2112 | 2112 | blob_appendf(&comment, " Timestamp %h.", zValue); |
| 2113 | 2113 | continue; |
| 2114 | 2114 | }else if( memcmp(zName, "-sym-",5)==0 ){ |
| 2115 | - if( !branchMove ) blob_appendf(&comment, " Cancel tag \"%h\"", &zName[5]); | |
| 2115 | + if( !branchMove ){ | |
| 2116 | + blob_appendf(&comment, " Cancel tag \"%h\"", &zName[5]); | |
| 2117 | + } | |
| 2116 | 2118 | }else if( memcmp(zName, "*sym-",5)==0 ){ |
| 2117 | 2119 | if( !branchMove ){ |
| 2118 | 2120 | blob_appendf(&comment, " Add propagating tag \"%h\"", &zName[5]); |
| 2119 | 2121 | } |
| 2120 | 2122 | }else if( memcmp(zName, "+sym-",5)==0 ){ |
| 2121 | 2123 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1348,13 +1348,13 @@ | |
| 1348 | ** Added files have mlink.pid=0. |
| 1349 | ** File added by merge have mlink.pid=-1 |
| 1350 | ** Edited files have both mlink.pid!=0 and mlink.fid!=0 |
| 1351 | */ |
| 1352 | static void add_mlink( |
| 1353 | int pmid, Manifest *pParent, /* Parent check-in */ |
| 1354 | int mid, Manifest *pChild, /* The child check-in */ |
| 1355 | int isPrim /* TRUE if pmid is the primary parent of mid */ |
| 1356 | ){ |
| 1357 | Blob otherContent; |
| 1358 | int otherRid; |
| 1359 | int i, rc; |
| 1360 | ManifestFile *pChildFile, *pParentFile; |
| @@ -2110,11 +2110,13 @@ | |
| 2110 | continue; |
| 2111 | }else if( strcmp(zName, "+date")==0 ){ |
| 2112 | blob_appendf(&comment, " Timestamp %h.", zValue); |
| 2113 | continue; |
| 2114 | }else if( memcmp(zName, "-sym-",5)==0 ){ |
| 2115 | if( !branchMove ) blob_appendf(&comment, " Cancel tag \"%h\"", &zName[5]); |
| 2116 | }else if( memcmp(zName, "*sym-",5)==0 ){ |
| 2117 | if( !branchMove ){ |
| 2118 | blob_appendf(&comment, " Add propagating tag \"%h\"", &zName[5]); |
| 2119 | } |
| 2120 | }else if( memcmp(zName, "+sym-",5)==0 ){ |
| 2121 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1348,13 +1348,13 @@ | |
| 1348 | ** Added files have mlink.pid=0. |
| 1349 | ** File added by merge have mlink.pid=-1 |
| 1350 | ** Edited files have both mlink.pid!=0 and mlink.fid!=0 |
| 1351 | */ |
| 1352 | static void add_mlink( |
| 1353 | int pmid, Manifest *pParent, /* Parent check-in */ |
| 1354 | int mid, Manifest *pChild, /* The child check-in */ |
| 1355 | int isPrim /* TRUE if pmid is the primary parent of mid */ |
| 1356 | ){ |
| 1357 | Blob otherContent; |
| 1358 | int otherRid; |
| 1359 | int i, rc; |
| 1360 | ManifestFile *pChildFile, *pParentFile; |
| @@ -2110,11 +2110,13 @@ | |
| 2110 | continue; |
| 2111 | }else if( strcmp(zName, "+date")==0 ){ |
| 2112 | blob_appendf(&comment, " Timestamp %h.", zValue); |
| 2113 | continue; |
| 2114 | }else if( memcmp(zName, "-sym-",5)==0 ){ |
| 2115 | if( !branchMove ){ |
| 2116 | blob_appendf(&comment, " Cancel tag \"%h\"", &zName[5]); |
| 2117 | } |
| 2118 | }else if( memcmp(zName, "*sym-",5)==0 ){ |
| 2119 | if( !branchMove ){ |
| 2120 | blob_appendf(&comment, " Add propagating tag \"%h\"", &zName[5]); |
| 2121 | } |
| 2122 | }else if( memcmp(zName, "+sym-",5)==0 ){ |
| 2123 |