Fossil SCM
Make merge a no-op when merging in the current checkout version, as suggested in [forum:6367db867c|forum post 6367db867c].
Commit
e84be9f2d6bd8356ca4aa1f85fac7fc36beaea272d0e4568750b938de40ba0be
Parent
a10f931ba1f9a90…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -987,11 +987,11 @@ | ||
| 987 | 987 | } |
| 988 | 988 | if( nid==0 ) nid = pid; |
| 989 | 989 | if( !is_a_version(pid) ){ |
| 990 | 990 | fossil_fatal("not a version: record #%d", pid); |
| 991 | 991 | } |
| 992 | - if( !forceFlag && mid==pid ){ | |
| 992 | + if( !forceFlag && (mid==pid || mid==vid) ){ | |
| 993 | 993 | fossil_print("Merge skipped because it is a no-op. " |
| 994 | 994 | " Use --force to override.\n"); |
| 995 | 995 | return; |
| 996 | 996 | } |
| 997 | 997 | if( integrateFlag && !is_a_leaf(mid)){ |
| 998 | 998 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -987,11 +987,11 @@ | |
| 987 | } |
| 988 | if( nid==0 ) nid = pid; |
| 989 | if( !is_a_version(pid) ){ |
| 990 | fossil_fatal("not a version: record #%d", pid); |
| 991 | } |
| 992 | if( !forceFlag && mid==pid ){ |
| 993 | fossil_print("Merge skipped because it is a no-op. " |
| 994 | " Use --force to override.\n"); |
| 995 | return; |
| 996 | } |
| 997 | if( integrateFlag && !is_a_leaf(mid)){ |
| 998 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -987,11 +987,11 @@ | |
| 987 | } |
| 988 | if( nid==0 ) nid = pid; |
| 989 | if( !is_a_version(pid) ){ |
| 990 | fossil_fatal("not a version: record #%d", pid); |
| 991 | } |
| 992 | if( !forceFlag && (mid==pid || mid==vid) ){ |
| 993 | fossil_print("Merge skipped because it is a no-op. " |
| 994 | " Use --force to override.\n"); |
| 995 | return; |
| 996 | } |
| 997 | if( integrateFlag && !is_a_leaf(mid)){ |
| 998 |