merge arne change
authorPierre-Yves David <pierre-yves.david@logilab.fr>
Wed, 28 Mar 2012 13:48:56 +0200
changeset 193 adf92ff8d4f6
parent 190 f111e19b763f (diff)
parent 192 706a3a57b567 (current diff)
child 194 b7145eed54fe
merge arne change
docs/obs-concept.rst
--- a/docs/obs-concept.rst	Wed Mar 28 12:50:42 2012 +0200
+++ b/docs/obs-concept.rst	Wed Mar 28 13:48:56 2012 +0200
@@ -89,8 +89,9 @@
 -----------------------------------------------------
 
 
-As None of the concepts was powerful enough to fulfill the need of safely rewriting                              
-history, including easy sharing and collaborating on mutable history, we needed another one. 
+As None of the concepts was powerful enough to fulfill the need of safely
+rewriting history, including easy sharing and collaborating on mutable history,
+we needed another one. 
 
 Basic concept
 -----------------------------------------------------
--- a/qsync-enable.sh	Wed Mar 28 12:50:42 2012 +0200
+++ b/qsync-enable.sh	Wed Mar 28 13:48:56 2012 +0200
@@ -16,5 +16,5 @@
 cat << EOF | sed -e "s#XXXREPOPATHXXX#${repo_root}#"
 [extensions]
 # experimental extensions for mq export
-obsolete=XXXREPOPATHXXX/hgext/qsync.py
+qsync=XXXREPOPATHXXX/hgext/qsync.py
 EOF