changeset 1991:a8a618c57690

merge with self
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 23 Mar 2006 23:55:51 +0100
parents 4b0535c678d6 (diff) 0541768fa558 (current diff)
children ea8345a7a29d
files mercurial/util.py
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/util.py	Thu Mar 23 23:16:41 2006 +0100
+++ b/mercurial/util.py	Thu Mar 23 23:55:51 2006 +0100
@@ -155,6 +155,13 @@
             group = False
         elif c == ',' and group:
             res += '|'
+        elif c == '\\':
+            p = peek()
+            if p:
+                i += 1
+                res += re.escape(p)
+            else:
+                res += re.escape(c)
         else:
             res += re.escape(c)
     return head + res + tail