diff options
| author | G.raud <graud@gmx.com> | 2018-02-02 18:28:26 +0100 |
|---|---|---|
| committer | G.raud <graud@gmx.com> | 2018-02-02 23:21:45 +0100 |
| commit | 693db45236dc2543c091b6da407d0b72a7421c08 (patch) | |
| tree | 091b7b478f21beeac21db77218e5ad0e9544bb4a | |
| parent | f730adcd27d037999c1f134851e86f17db49ead2 (diff) | |
| download | unison-693db45236dc2543c091b6da407d0b72a7421c08.zip unison-693db45236dc2543c091b6da407d0b72a7421c08.tar.gz unison-693db45236dc2543c091b6da407d0b72a7421c08.tar.bz2 | |
Uitext: let setting of direction operate on matching items
| -rw-r--r-- | src/uitext.ml | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/uitext.ml b/src/uitext.ml index 1d7f0a4..0e8bdf0 100644 --- a/src/uitext.ml +++ b/src/uitext.ml @@ -268,8 +268,8 @@ let interact prilist rilist = {replicas = Different ({direction = Conflict _})} -> () | {replicas = Different diff} -> diff.direction <- Conflict "skip requested" | _ -> () - and setmerge = function - {replicas = Different diff} -> begin diff.direction <- Merge; true end + and setdir dir = function + {replicas = Different diff} -> begin diff.direction <- dir; true end | _ -> true in let ripred = ref None in @@ -420,19 +420,15 @@ let interact prilist rilist = (["m"], ("merge the versions"), (fun () -> - actOnMatching setmerge)); + actOnMatching (setdir Merge))); ([">";"."], ("propagate from " ^ descr), (fun () -> - diff.direction <- Replica1ToReplica2; - redisplayri(); - next())); + actOnMatching (setdir Replica1ToReplica2))); (["<";","], ("propagate from " ^ descl), (fun () -> - diff.direction <- Replica2ToReplica1; - redisplayri(); - next())); + actOnMatching (setdir Replica2ToReplica1))); (["]";"\""], ("resolve conflicts in favor of the newer file"), (fun () -> |