From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 4 Apr 2009 22:38:16 +0000 (-0400)
Subject: Merge branch 'darcs'
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/760e1009470d624b272020d5e4abc17483b23a33?hp=-c

Merge branch 'darcs'

Conflicts:
	debian/changelog
---

760e1009470d624b272020d5e4abc17483b23a33
diff --combined IkiWiki/Setup/Automator.pm
index c194d34be,8a451d386..5111541e4
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@@ -58,6 -58,9 +58,9 @@@ sub import (@) 
  		elsif ($config{rcs} eq 'monotone') {
  			$config{mtn_wrapper}=$config{srcdir}."_MTN/ikiwiki-netsync-hook";
  		}
+ 		elsif ($config{rcs} eq 'darcs') {
+ 			$config{darcs_wrapper}=$config{repository}."/_darcs/ikiwiki-wrapper";
+ 		}
  		elsif ($config{rcs} eq 'bzr') {
  			# TODO
  		}
@@@ -117,7 -120,6 +120,7 @@@
  		for (;;) {
  			print "Choose a password: ";
  			chomp($password=<STDIN>);
 +			print "\n";
  			print "Confirm password: ";
  			chomp($password2=<STDIN>);
  
diff --combined debian/changelog
index 781024146,2b1f938b3..bbc7e6f13
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,15 +1,16 @@@
  ikiwiki (3.10) UNRELEASED; urgency=low
  
+   * darcs: Finally added support for this VCS, thanks to many
+     contributors:
+     - Thomas Schwinge wrote the original file, implementing only rcs_commit.
+     - Benjamin A'Lee contributed an alternative implementation.
+     - Tuomo Valkonen contributed rcs_getctime and stub rcs_recentchanges.
+     - Simon Michael contributed multiple changes.
+     - Petr Ročkai fixed rcs_recentchanges.
+     - Sven M. Hallberg merged the above and added missing features.
 +  * Add missing newline to Confirm Password prompt.
  
-  -- Joey Hess <joeyh@debian.org>  Sat, 04 Apr 2009 18:25:33 -0400
+  -- Joey Hess <joeyh@debian.org>  Sat, 04 Apr 2009 17:47:36 -0400
  
  ikiwiki (3.09) unstable; urgency=low