Mercurial Mercurial > hg-stable / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/convert/__init__.py
changeset 8541 06ace50443f6
parent 8377 29f4f0d66cd5
child 8598 5edb2a8e29ea 
--- a/hgext/convert/__init__.py	Thu May 21 17:36:19 2009 +0200
+++ b/hgext/convert/__init__.py	Thu May 21 22:53:26 2009 +0200
@@ -144,13 +144,13 @@
             single changeset. When very large files were checked in as
             part of a changeset then the default may not be long
             enough.
-        --config convert.cvsps.mergeto='{{mergetobranch ([-\w]+)}}'
+        --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'
             Specify a regular expression to which commit log messages
             are matched. If a match occurs, then the conversion
             process will insert a dummy revision merging the branch on
             which this log message occurs to the branch indicated in
             the regex.
-        --config convert.cvsps.mergefrom='{{mergefrombranch ([-\w]+)}}'
+        --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'
             Specify a regular expression to which commit log messages
             are matched. If a match occurs, then the conversion
             process will add the most recent revision on the branch
hg-stable