summaryrefslogtreecommitdiffstats
path: root/src/update.mli
diff options
context:
space:
mode:
authorJérôme Vouillon <vouillon@pps.jussieu.fr>2009-07-10 19:51:15 +0000
committerJérôme Vouillon <vouillon@pps.jussieu.fr>2009-07-10 19:51:15 +0000
commit005a53075b998dba27eeff74a1fc8f9d73558fb8 (patch)
treed81d2687b5f96bd57b9b86e5ebd50ed172794a33 /src/update.mli
parent59e44114fd936c3f53f1d39c6cf442f5921bc243 (diff)
downloadunison-005a53075b998dba27eeff74a1fc8f9d73558fb8.zip
unison-005a53075b998dba27eeff74a1fc8f9d73558fb8.tar.gz
unison-005a53075b998dba27eeff74a1fc8f9d73558fb8.tar.bz2
* Fixed bug with case insensitive mode on a case sensitive filesystem:
- if file "a/a" is created on one replica and directory "A" is created on the other, the file failed to be synchronized the first time Unison is run afterwards, as Unison uses the wrong path "a/a" (if Unison is run again, the directories are in the archive, so the right path is used); - if file "a" appears on one replica and file "A" appears on the other with a different contents, Unison was unable to synchronized them.
Diffstat (limited to 'src/update.mli')
-rw-r--r--src/update.mli7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/update.mli b/src/update.mli
index 99a32bc..51134df 100644
--- a/src/update.mli
+++ b/src/update.mli
@@ -18,16 +18,13 @@ val storeRootsName : unit -> unit
(* Retrieve the actual names of the roots *)
val getRootsName : unit -> string
-val findOnRoot :
- Common.root -> Path.t list -> Common.updateItem list Lwt.t
-
(* Structures describing dirty files/dirs (1 per path given in the -path preference) *)
val findUpdates :
- unit -> Common.updateItem list Common.oneperpath
+ unit -> (Path.t * Common.updateItem * Path.t * Common.updateItem) list
(* Take a tree of equal update contents and update the archive accordingly. *)
val markEqual :
- (Name.t, Common.updateContent * Common.updateContent) Tree.t -> unit
+ (Name.t * Name.t, Common.updateContent * Common.updateContent) Tree.t -> unit
(* Get and update a part of an archive (the archive remains unchanged) *)
val updateArchive : Fspath.t -> Path.local -> Common.updateItem -> archive