Fossil SCM
Do not offer to undo a null-merge.
Commit
ad39c28195ef657df2a37c5a4b6f8d68cc37ed4b
Parent
46ef28939210944…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -138,11 +138,11 @@ | ||
| 138 | 138 | if( !is_a_version(pid) ){ |
| 139 | 139 | fossil_fatal("not a version: record #%d", pid); |
| 140 | 140 | } |
| 141 | 141 | vfile_check_signature(vid, 1, 0); |
| 142 | 142 | db_begin_transaction(); |
| 143 | - undo_begin(); | |
| 143 | + if( !nochangeFlag ) undo_begin(); | |
| 144 | 144 | load_vfile_from_rid(mid); |
| 145 | 145 | load_vfile_from_rid(pid); |
| 146 | 146 | |
| 147 | 147 | /* |
| 148 | 148 | ** The vfile.pathname field is used to match files against each other. The |
| 149 | 149 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -138,11 +138,11 @@ | |
| 138 | if( !is_a_version(pid) ){ |
| 139 | fossil_fatal("not a version: record #%d", pid); |
| 140 | } |
| 141 | vfile_check_signature(vid, 1, 0); |
| 142 | db_begin_transaction(); |
| 143 | undo_begin(); |
| 144 | load_vfile_from_rid(mid); |
| 145 | load_vfile_from_rid(pid); |
| 146 | |
| 147 | /* |
| 148 | ** The vfile.pathname field is used to match files against each other. The |
| 149 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -138,11 +138,11 @@ | |
| 138 | if( !is_a_version(pid) ){ |
| 139 | fossil_fatal("not a version: record #%d", pid); |
| 140 | } |
| 141 | vfile_check_signature(vid, 1, 0); |
| 142 | db_begin_transaction(); |
| 143 | if( !nochangeFlag ) undo_begin(); |
| 144 | load_vfile_from_rid(mid); |
| 145 | load_vfile_from_rid(pid); |
| 146 | |
| 147 | /* |
| 148 | ** The vfile.pathname field is used to match files against each other. The |
| 149 |