Fossil SCM
Do not record a full-merge when the --backout option is used.
Commit
b6710a0143974b716007a7f5da1bd8fed0b3a27b
Parent
a9055964f371eed…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -554,11 +554,11 @@ | ||
| 554 | 554 | |
| 555 | 555 | /* |
| 556 | 556 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 557 | 557 | */ |
| 558 | 558 | db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid); |
| 559 | - if( !pickFlag ){ | |
| 559 | + if( !pickFlag && !backoutFlag ){ | |
| 560 | 560 | db_multi_exec("INSERT OR IGNORE INTO vmerge(id,merge) VALUES(0,%d)", mid); |
| 561 | 561 | } |
| 562 | 562 | undo_finish(); |
| 563 | 563 | db_end_transaction(nochangeFlag); |
| 564 | 564 | } |
| 565 | 565 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -554,11 +554,11 @@ | |
| 554 | |
| 555 | /* |
| 556 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 557 | */ |
| 558 | db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid); |
| 559 | if( !pickFlag ){ |
| 560 | db_multi_exec("INSERT OR IGNORE INTO vmerge(id,merge) VALUES(0,%d)", mid); |
| 561 | } |
| 562 | undo_finish(); |
| 563 | db_end_transaction(nochangeFlag); |
| 564 | } |
| 565 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -554,11 +554,11 @@ | |
| 554 | |
| 555 | /* |
| 556 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 557 | */ |
| 558 | db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid); |
| 559 | if( !pickFlag && !backoutFlag ){ |
| 560 | db_multi_exec("INSERT OR IGNORE INTO vmerge(id,merge) VALUES(0,%d)", mid); |
| 561 | } |
| 562 | undo_finish(); |
| 563 | db_end_transaction(nochangeFlag); |
| 564 | } |
| 565 |