Fossil SCM
Fix overzealous identification of no-op merges that are not really no-ops.
Commit
efba2bc17b2586e8ea782160689d81c7243b4678
Parent
ae85ba156cae59e…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -180,11 +180,11 @@ | ||
| 180 | 180 | mid = t; |
| 181 | 181 | } |
| 182 | 182 | if( !is_a_version(pid) ){ |
| 183 | 183 | fossil_fatal("not a version: record #%d", pid); |
| 184 | 184 | } |
| 185 | - if( !forceFlag && (mid==pid || vid==pid || mid==vid) ){ | |
| 185 | + if( !forceFlag && mid==pid ){ | |
| 186 | 186 | fossil_print("Merge skipped because it is a no-op. " |
| 187 | 187 | " Use --force to override.\n"); |
| 188 | 188 | return; |
| 189 | 189 | } |
| 190 | 190 | if( detailFlag ){ |
| 191 | 191 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -180,11 +180,11 @@ | |
| 180 | mid = t; |
| 181 | } |
| 182 | if( !is_a_version(pid) ){ |
| 183 | fossil_fatal("not a version: record #%d", pid); |
| 184 | } |
| 185 | if( !forceFlag && (mid==pid || vid==pid || mid==vid) ){ |
| 186 | fossil_print("Merge skipped because it is a no-op. " |
| 187 | " Use --force to override.\n"); |
| 188 | return; |
| 189 | } |
| 190 | if( detailFlag ){ |
| 191 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -180,11 +180,11 @@ | |
| 180 | mid = t; |
| 181 | } |
| 182 | if( !is_a_version(pid) ){ |
| 183 | fossil_fatal("not a version: record #%d", pid); |
| 184 | } |
| 185 | if( !forceFlag && mid==pid ){ |
| 186 | fossil_print("Merge skipped because it is a no-op. " |
| 187 | " Use --force to override.\n"); |
| 188 | return; |
| 189 | } |
| 190 | if( detailFlag ){ |
| 191 |