diff options
| author | G.raud <graud@gmx.com> | 2018-02-03 13:08:09 +0100 |
|---|---|---|
| committer | G.raud <graud@gmx.com> | 2018-02-03 18:17:14 +0100 |
| commit | 1c3b29b5f9604321c5c2cce06c4e87a0cb3e54ce (patch) | |
| tree | a0b6c747ae6360864b59f8a11a1dafc8fe853867 | |
| parent | dab5ecdffafb2b59d09c84785c25cfebf7ebcb69 (diff) | |
| download | unison-1c3b29b5f9604321c5c2cce06c4e87a0cb3e54ce.zip unison-1c3b29b5f9604321c5c2cce06c4e87a0cb3e54ce.tar.gz unison-1c3b29b5f9604321c5c2cce06c4e87a0cb3e54ce.tar.bz2 | |
Uitext.interact: new subfunction invertdir
| -rw-r--r-- | src/uitext.ml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/uitext.ml b/src/uitext.ml index b491681..38d6e3a 100644 --- a/src/uitext.ml +++ b/src/uitext.ml @@ -279,6 +279,12 @@ let interact prilist rilist = and setdir dir = function {replicas = Different diff} -> begin diff.direction <- dir; true end | _ -> true + and invertdir = function + {replicas = Different ({direction = Replica1ToReplica2} as diff)} + -> diff.direction <- Replica2ToReplica1; true + | {replicas = Different ({direction = Replica2ToReplica1} as diff)} + -> diff.direction <- Replica1ToReplica2; true + | _ -> true and setDirectionIfConflict dir = function {replicas = Different ({direction = Conflict _})} as ri -> begin Recon.setDirection ri dir `Force; true end |