Fossil SCM
Fix undo to revert all changes after performing a merge with multiple versions specified.
Commit
3c8d90873e3b8b04d466d4dfacb5007965a72353d0ecf86b78ba652e08629b78
Parent
d04ad10377c872a…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -1050,11 +1050,11 @@ | ||
| 1050 | 1050 | integrateFlag ? "integrate:" : "merge-from:"); |
| 1051 | 1051 | print_checkin_description(pid, 12, "baseline:"); |
| 1052 | 1052 | } |
| 1053 | 1053 | vfile_check_signature(vid, CKSIG_ENOTFILE); |
| 1054 | 1054 | if( nMerge==0 ) db_begin_transaction(); |
| 1055 | - if( useUndo ) undo_begin(); | |
| 1055 | + if( useUndo && nMerge==0 ) undo_begin(); | |
| 1056 | 1056 | if( load_vfile_from_rid(mid) && !forceMissingFlag ){ |
| 1057 | 1057 | fossil_fatal("missing content, unable to merge"); |
| 1058 | 1058 | } |
| 1059 | 1059 | if( load_vfile_from_rid(pid) && !forceMissingFlag ){ |
| 1060 | 1060 | fossil_fatal("missing content, unable to merge"); |
| 1061 | 1061 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -1050,11 +1050,11 @@ | |
| 1050 | integrateFlag ? "integrate:" : "merge-from:"); |
| 1051 | print_checkin_description(pid, 12, "baseline:"); |
| 1052 | } |
| 1053 | vfile_check_signature(vid, CKSIG_ENOTFILE); |
| 1054 | if( nMerge==0 ) db_begin_transaction(); |
| 1055 | if( useUndo ) undo_begin(); |
| 1056 | if( load_vfile_from_rid(mid) && !forceMissingFlag ){ |
| 1057 | fossil_fatal("missing content, unable to merge"); |
| 1058 | } |
| 1059 | if( load_vfile_from_rid(pid) && !forceMissingFlag ){ |
| 1060 | fossil_fatal("missing content, unable to merge"); |
| 1061 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -1050,11 +1050,11 @@ | |
| 1050 | integrateFlag ? "integrate:" : "merge-from:"); |
| 1051 | print_checkin_description(pid, 12, "baseline:"); |
| 1052 | } |
| 1053 | vfile_check_signature(vid, CKSIG_ENOTFILE); |
| 1054 | if( nMerge==0 ) db_begin_transaction(); |
| 1055 | if( useUndo && nMerge==0 ) undo_begin(); |
| 1056 | if( load_vfile_from_rid(mid) && !forceMissingFlag ){ |
| 1057 | fossil_fatal("missing content, unable to merge"); |
| 1058 | } |
| 1059 | if( load_vfile_from_rid(pid) && !forceMissingFlag ){ |
| 1060 | fossil_fatal("missing content, unable to merge"); |
| 1061 |