diff options
| author | G.raud <graud@gmx.com> | 2018-02-04 07:50:11 +0100 |
|---|---|---|
| committer | G.raud <graud@gmx.com> | 2018-02-04 11:29:34 +0100 |
| commit | a7da919e539bd52c3da7401baca5b1bd2da3b578 (patch) | |
| tree | c4634aa6954c8a80993fe3fecf875aa1f0549886 /src | |
| parent | cbc44d26a30004afbf17bc087c0cd8b18b81d8b7 (diff) | |
| download | unison-a7da919e539bd52c3da7401baca5b1bd2da3b578.zip unison-a7da919e539bd52c3da7401baca5b1bd2da3b578.tar.gz unison-a7da919e539bd52c3da7401baca5b1bd2da3b578.tar.bz2 | |
Uitext.interact: new subfunction setdirchanged
Diffstat (limited to 'src')
| -rw-r--r-- | src/uitext.ml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/uitext.ml b/src/uitext.ml index c17b52c..7dffec8 100644 --- a/src/uitext.ml +++ b/src/uitext.ml @@ -271,6 +271,15 @@ let interact prilist rilist = | {replicas = Different {rc1 = rc1; rc2 = rc2}} when rc1.status = `Unchanged && rc2.status = `PropsChanged -> true | _ -> false + and setdirchanged = function + {replicas = Different ({rc1 = rc1; rc2 = rc2} as diff)} + when rc1.status = `Modified && rc2.status = `PropsChanged -> + diff.direction <- Replica1ToReplica2; true + | {replicas = Different ({rc1 = rc1; rc2 = rc2} as diff)} + when rc1.status = `PropsChanged && rc2.status = `Modified -> + diff.direction <- Replica2ToReplica1; true + | {replicas = Different _} -> false + | _ -> true and setskip = function {replicas = Different ({direction = Conflict _})} -> true | {replicas = Different diff} -> |