Fossil SCM

Correct fork

andygoth 2016-09-15 19:51 trunk merge
Commit ef5f795176b6a1496b41daba6cb3e66ea3636bfe
1 file changed +6 -2
+6 -2
--- src/manifest.c
+++ src/manifest.c
@@ -2327,21 +2327,25 @@
23272327
blob_appendf(&comment, " Timestamp %h.", zValue);
23282328
continue;
23292329
}else if( memcmp(zName, "-sym-",5)==0 ){
23302330
if( !branchMove ){
23312331
blob_appendf(&comment, " Cancel tag \"%h\"", &zName[5]);
2332
+ }else{
2333
+ continue;
23322334
}
23332335
}else if( memcmp(zName, "*sym-",5)==0 ){
23342336
if( !branchMove ){
23352337
blob_appendf(&comment, " Add propagating tag \"%h\"", &zName[5]);
2338
+ }else{
2339
+ continue;
23362340
}
23372341
}else if( memcmp(zName, "+sym-",5)==0 ){
23382342
blob_appendf(&comment, " Add tag \"%h\"", &zName[5]);
23392343
}else if( strcmp(zName, "+closed")==0 ){
2340
- blob_append(&comment, " Marked \"Closed\"", -1);
2344
+ blob_append(&comment, " Mark \"Closed\"", -1);
23412345
}else if( strcmp(zName, "-closed")==0 ){
2342
- blob_append(&comment, " Removed the \"Closed\" mark", -1);
2346
+ blob_append(&comment, " Remove the \"Closed\" mark", -1);
23432347
}else {
23442348
if( zName[0]=='-' ){
23452349
blob_appendf(&comment, " Cancel \"%h\"", &zName[1]);
23462350
}else if( zName[0]=='+' ){
23472351
blob_appendf(&comment, " Add \"%h\"", &zName[1]);
23482352
--- src/manifest.c
+++ src/manifest.c
@@ -2327,21 +2327,25 @@
2327 blob_appendf(&comment, " Timestamp %h.", zValue);
2328 continue;
2329 }else if( memcmp(zName, "-sym-",5)==0 ){
2330 if( !branchMove ){
2331 blob_appendf(&comment, " Cancel tag \"%h\"", &zName[5]);
 
 
2332 }
2333 }else if( memcmp(zName, "*sym-",5)==0 ){
2334 if( !branchMove ){
2335 blob_appendf(&comment, " Add propagating tag \"%h\"", &zName[5]);
 
 
2336 }
2337 }else if( memcmp(zName, "+sym-",5)==0 ){
2338 blob_appendf(&comment, " Add tag \"%h\"", &zName[5]);
2339 }else if( strcmp(zName, "+closed")==0 ){
2340 blob_append(&comment, " Marked \"Closed\"", -1);
2341 }else if( strcmp(zName, "-closed")==0 ){
2342 blob_append(&comment, " Removed the \"Closed\" mark", -1);
2343 }else {
2344 if( zName[0]=='-' ){
2345 blob_appendf(&comment, " Cancel \"%h\"", &zName[1]);
2346 }else if( zName[0]=='+' ){
2347 blob_appendf(&comment, " Add \"%h\"", &zName[1]);
2348
--- src/manifest.c
+++ src/manifest.c
@@ -2327,21 +2327,25 @@
2327 blob_appendf(&comment, " Timestamp %h.", zValue);
2328 continue;
2329 }else if( memcmp(zName, "-sym-",5)==0 ){
2330 if( !branchMove ){
2331 blob_appendf(&comment, " Cancel tag \"%h\"", &zName[5]);
2332 }else{
2333 continue;
2334 }
2335 }else if( memcmp(zName, "*sym-",5)==0 ){
2336 if( !branchMove ){
2337 blob_appendf(&comment, " Add propagating tag \"%h\"", &zName[5]);
2338 }else{
2339 continue;
2340 }
2341 }else if( memcmp(zName, "+sym-",5)==0 ){
2342 blob_appendf(&comment, " Add tag \"%h\"", &zName[5]);
2343 }else if( strcmp(zName, "+closed")==0 ){
2344 blob_append(&comment, " Mark \"Closed\"", -1);
2345 }else if( strcmp(zName, "-closed")==0 ){
2346 blob_append(&comment, " Remove the \"Closed\" mark", -1);
2347 }else {
2348 if( zName[0]=='-' ){
2349 blob_appendf(&comment, " Cancel \"%h\"", &zName[1]);
2350 }else if( zName[0]=='+' ){
2351 blob_appendf(&comment, " Add \"%h\"", &zName[1]);
2352

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button