From e789263068a7e5fd9d2d67ad3a8099108178cdb3 Mon Sep 17 00:00:00 2001 From: Thomas Keller Date: Mon, 30 Aug 2010 12:58:52 +0000 Subject: [PATCH] - raise required mtn version to 0.99 - add '--key=' to the default mtn arguments in idf.php-dist --- doc/readme-monotone.mdtext | 5 ++--- src/IDF/conf/idf.php-dist | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/readme-monotone.mdtext b/doc/readme-monotone.mdtext index 2e54367..cbaf8ba 100644 --- a/doc/readme-monotone.mdtext +++ b/doc/readme-monotone.mdtext @@ -3,9 +3,8 @@ ## general This version of indefero contains an implementation of the monotone - automation interface. It needs at least monotone version 0.47 - (interface version 12.0) or newer, but as development continues, its - likely that this dependency has to be raised. + automation interface. It needs at least monotone version 0.99 + (interface version 13.0) or newer. To set up a new IDF project with monotone quickly, all you need to do is to create a new monotone database with diff --git a/src/IDF/conf/idf.php-dist b/src/IDF/conf/idf.php-dist index 57d3e95..9339a5a 100644 --- a/src/IDF/conf/idf.php-dist +++ b/src/IDF/conf/idf.php-dist @@ -73,10 +73,10 @@ $cfg['git_write_remote_url'] = 'git@localhost:%s.git'; $cfg['svn_repositories'] = 'file:///home/svn/repositories/%s'; $cfg['svn_remote_url'] = 'http://localhost/svn/%s'; -# Path to the monotone binary +# Path to the monotone binary (you need mtn 0.99 or newer) $cfg['mtn_path'] = 'mtn'; # Additional options for the started monotone process -$cfg['mtn_opts'] = array('--no-workspace', '--norc'); +$cfg['mtn_opts'] = array('--no-workspace', '--no-standard-rcfiles', '--key='); # # You can setup monotone for use with indefero in several ways. The # two most-used should be: