Fossil SCM
undo [bf079432fb]: It's crucial for the Tcl fossil repository to be able to do a no-op merge-mark. This change would make that impossible.
Commit
41577fd3ef8cd65d0e68d2cf28134c148f382955
Parent
517309406aef963…
1 file changed
-4
-4
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -176,14 +176,10 @@ | ||
| 176 | 176 | mid = t; |
| 177 | 177 | } |
| 178 | 178 | if( !is_a_version(pid) ){ |
| 179 | 179 | fossil_fatal("not a version: record #%d", pid); |
| 180 | 180 | } |
| 181 | - if( mid==pid ){ | |
| 182 | - fossil_print("This merge is a no-op.\n"); | |
| 183 | - return; | |
| 184 | - } | |
| 185 | 181 | if( detailFlag ){ |
| 186 | 182 | print_checkin_description(mid, 12, "merge-from:"); |
| 187 | 183 | print_checkin_description(pid, 12, "baseline:"); |
| 188 | 184 | } |
| 189 | 185 | vfile_check_signature(vid, 1, 0); |
| 190 | 186 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -176,14 +176,10 @@ | |
| 176 | mid = t; |
| 177 | } |
| 178 | if( !is_a_version(pid) ){ |
| 179 | fossil_fatal("not a version: record #%d", pid); |
| 180 | } |
| 181 | if( mid==pid ){ |
| 182 | fossil_print("This merge is a no-op.\n"); |
| 183 | return; |
| 184 | } |
| 185 | if( detailFlag ){ |
| 186 | print_checkin_description(mid, 12, "merge-from:"); |
| 187 | print_checkin_description(pid, 12, "baseline:"); |
| 188 | } |
| 189 | vfile_check_signature(vid, 1, 0); |
| 190 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -176,14 +176,10 @@ | |
| 176 | mid = t; |
| 177 | } |
| 178 | if( !is_a_version(pid) ){ |
| 179 | fossil_fatal("not a version: record #%d", pid); |
| 180 | } |
| 181 | if( detailFlag ){ |
| 182 | print_checkin_description(mid, 12, "merge-from:"); |
| 183 | print_checkin_description(pid, 12, "baseline:"); |
| 184 | } |
| 185 | vfile_check_signature(vid, 1, 0); |
| 186 |