diff options
| author | Jérôme Vouillon <vouillon@pps.jussieu.fr> | 2009-07-10 19:51:15 +0000 |
|---|---|---|
| committer | Jérôme Vouillon <vouillon@pps.jussieu.fr> | 2009-07-10 19:51:15 +0000 |
| commit | 005a53075b998dba27eeff74a1fc8f9d73558fb8 (patch) | |
| tree | d81d2687b5f96bd57b9b86e5ebd50ed172794a33 /src/common.ml | |
| parent | 59e44114fd936c3f53f1d39c6cf442f5921bc243 (diff) | |
| download | unison-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/common.ml')
| -rw-r--r-- | src/common.ml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/common.ml b/src/common.ml index bd3763c..b10cfa5 100644 --- a/src/common.ml +++ b/src/common.ml @@ -140,9 +140,7 @@ type replicas = Problem of string (* There was a problem during update detection *) | Different of difference (* Replicas differ *) -type reconItem = - {path : Path.t; - replicas : replicas} +type reconItem = {path1 : Path.t; path2 : Path.t; replicas : replicas} let ucLength = function File(desc,_) -> Props.length desc |