Re: [Monotone-devel] Revision 7fcd4b5f6fa9bf6c64e9ddf2332dcf4639655a6f

[Markus Schiltknecht]

Hi,

I wrote:
> I've had a quick look at paths.cc, but...

..commenting out your normalize_path and falling back to the boost logic 
works, for boost 1.33 that is. See attached patch.

I'm not sure how to fix this.

Regards

Markus


# 
# old_revision [c6b75b418a1bf988ceb1b9a38655867c3687ef60]
# 
# patch "paths.cc"
#  from [caac11284c391b9fc6abfaa75e5986e77e84b2ff]
#    to [1ee3a26441f2c5678fa7a82b5d6b681b4e45bcdd]
# 
============================================================
--- paths.cc    caac11284c391b9fc6abfaa75e5986e77e84b2ff
+++ paths.cc    1ee3a26441f2c5678fa7a82b5d6b681b4e45bcdd
@@ -249,6 +249,7 @@ internal_string_to_split_path(string con
   I(fully_normalized_path_split(path, true, sp));
 }
 
+#if 0
 // path::normalize() is deprecated in Boost 1.34, and also
 // doesn't remove leading or trailing dots any more.
 static fs::path
@@ -279,6 +280,13 @@ normalize_path(fs::path const & in)
     }
   return out;
 }
+#else
+static fs::path
+normalize_path(fs::path const & in)
+{
+  return fs::path(in).normalize();
+}
+#endif
 
 static void
 normalize_external_path(string const & path, string & normalized)