Fossil SCM
Take into account local (uncommitted) changes when doing a merge.
Commit
7ec43ccb7a1f3481429d6799ff030a7a7e28458d
Parent
3f490bcbcff2fa2…
1 file changed
+4
-2
+4
-2
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -144,12 +144,14 @@ | ||
| 144 | 144 | " idp=coalesce((SELECT id FROM vfile WHERE vid=%d AND pathname=fn),0)," |
| 145 | 145 | " ridp=coalesce((SELECT rid FROM vfile WHERE vid=%d AND pathname=fn),0)," |
| 146 | 146 | " idm=coalesce((SELECT id FROM vfile WHERE vid=%d AND pathname=fn),0)," |
| 147 | 147 | " ridm=coalesce((SELECT rid FROM vfile WHERE vid=%d AND pathname=fn),0)," |
| 148 | 148 | " idv=coalesce((SELECT id FROM vfile WHERE vid=%d AND pathname=fn),0)," |
| 149 | - " ridv=coalesce((SELECT rid FROM vfile WHERE vid=%d AND pathname=fn),0)", | |
| 150 | - pid, pid, mid, mid, vid, vid | |
| 149 | + " ridv=coalesce((SELECT rid FROM vfile WHERE vid=%d AND pathname=fn),0)," | |
| 150 | + " chnged=coalesce((SELECT chnged FROM vfile" | |
| 151 | + " WHERE vid=%d AND pathname=fn),0)", | |
| 152 | + pid, pid, mid, mid, vid, vid, vid | |
| 151 | 153 | ); |
| 152 | 154 | |
| 153 | 155 | /* |
| 154 | 156 | ** Find files in mid and vid but not in pid and report conflicts. |
| 155 | 157 | ** The file in mid will be ignored. It will be treated as if it |
| 156 | 158 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -144,12 +144,14 @@ | |
| 144 | " idp=coalesce((SELECT id FROM vfile WHERE vid=%d AND pathname=fn),0)," |
| 145 | " ridp=coalesce((SELECT rid FROM vfile WHERE vid=%d AND pathname=fn),0)," |
| 146 | " idm=coalesce((SELECT id FROM vfile WHERE vid=%d AND pathname=fn),0)," |
| 147 | " ridm=coalesce((SELECT rid FROM vfile WHERE vid=%d AND pathname=fn),0)," |
| 148 | " idv=coalesce((SELECT id FROM vfile WHERE vid=%d AND pathname=fn),0)," |
| 149 | " ridv=coalesce((SELECT rid FROM vfile WHERE vid=%d AND pathname=fn),0)", |
| 150 | pid, pid, mid, mid, vid, vid |
| 151 | ); |
| 152 | |
| 153 | /* |
| 154 | ** Find files in mid and vid but not in pid and report conflicts. |
| 155 | ** The file in mid will be ignored. It will be treated as if it |
| 156 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -144,12 +144,14 @@ | |
| 144 | " idp=coalesce((SELECT id FROM vfile WHERE vid=%d AND pathname=fn),0)," |
| 145 | " ridp=coalesce((SELECT rid FROM vfile WHERE vid=%d AND pathname=fn),0)," |
| 146 | " idm=coalesce((SELECT id FROM vfile WHERE vid=%d AND pathname=fn),0)," |
| 147 | " ridm=coalesce((SELECT rid FROM vfile WHERE vid=%d AND pathname=fn),0)," |
| 148 | " idv=coalesce((SELECT id FROM vfile WHERE vid=%d AND pathname=fn),0)," |
| 149 | " ridv=coalesce((SELECT rid FROM vfile WHERE vid=%d AND pathname=fn),0)," |
| 150 | " chnged=coalesce((SELECT chnged FROM vfile" |
| 151 | " WHERE vid=%d AND pathname=fn),0)", |
| 152 | pid, pid, mid, mid, vid, vid, vid |
| 153 | ); |
| 154 | |
| 155 | /* |
| 156 | ** Find files in mid and vid but not in pid and report conflicts. |
| 157 | ** The file in mid will be ignored. It will be treated as if it |
| 158 |