Fossil SCM
I make 'merge --baseline' not introduce a new parent in the merge checkin. I think it should behave like --cherrypick.
Commit
ba402f33b2478cfb1618effecdb1f6b1e8365ac2
Parent
b7f3a32d4e67a90…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -555,11 +555,11 @@ | ||
| 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 | 559 | db_multi_exec("INSERT OR IGNORE INTO vmerge(id,merge) VALUES(%d,%d)", |
| 560 | - pickFlag ? -1 : (backoutFlag ? -2 : 0), mid); | |
| 560 | + pickFlag ? -1 : (backoutFlag ? -2 : (zPivot ? -3 : 0)), mid); | |
| 561 | 561 | if( pickFlag ){ |
| 562 | 562 | /* For a cherry-pick merge, make the default check-in comment the same |
| 563 | 563 | ** as the check-in comment on the check-in that is being merged in. */ |
| 564 | 564 | db_multi_exec( |
| 565 | 565 | "REPLACE INTO vvar(name,value)" |
| 566 | 566 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -555,11 +555,11 @@ | |
| 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 | db_multi_exec("INSERT OR IGNORE INTO vmerge(id,merge) VALUES(%d,%d)", |
| 560 | pickFlag ? -1 : (backoutFlag ? -2 : 0), mid); |
| 561 | if( pickFlag ){ |
| 562 | /* For a cherry-pick merge, make the default check-in comment the same |
| 563 | ** as the check-in comment on the check-in that is being merged in. */ |
| 564 | db_multi_exec( |
| 565 | "REPLACE INTO vvar(name,value)" |
| 566 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -555,11 +555,11 @@ | |
| 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 | db_multi_exec("INSERT OR IGNORE INTO vmerge(id,merge) VALUES(%d,%d)", |
| 560 | pickFlag ? -1 : (backoutFlag ? -2 : (zPivot ? -3 : 0)), mid); |
| 561 | if( pickFlag ){ |
| 562 | /* For a cherry-pick merge, make the default check-in comment the same |
| 563 | ** as the check-in comment on the check-in that is being merged in. */ |
| 564 | db_multi_exec( |
| 565 | "REPLACE INTO vvar(name,value)" |
| 566 |