Merge commit 'origin/master' into pub/master

[git.ikiwiki.info.git] / doc / todo / darcs.mdwn

diff --git a/doc/todo/darcs.mdwn b/doc/todo/darcs.mdwn
index f383514a2cea6e9d8cd80505c6fca8c765d53c11..e5bf5ee271fe32d98ba2ab50140d9f99f187a979 100644 (file)
--- a/doc/todo/darcs.mdwn
+++ b/doc/todo/darcs.mdwn
@@ -490,6 +490,9 @@ And here's yet another one, including an updated `ikiwiki-makerepo`. :)
 
 <http://khjk.org/~pesco/ikiwiki-darcs/> (now a darcs repo)
 
 
 <http://khjk.org/~pesco/ikiwiki-darcs/> (now a darcs repo)
 

+> Note that there's a 'darcs' branch in git that I'm keeping a copy of your
+> code in. Just in case. :-)
+

 I've taken all the good stuff from the above and added the missing hooks. The code hasn't seen a lot of testing, so some bugs are likely yet to surface. Also, I'm not experienced with perl and don't know where I should have used the function `possibly_foolish_untaint`.
 
 Regarding the repository layout: There are two darcs repositories. One is the `srcdir`, the other we'll call `master`.
 I've taken all the good stuff from the above and added the missing hooks. The code hasn't seen a lot of testing, so some bugs are likely yet to surface. Also, I'm not experienced with perl and don't know where I should have used the function `possibly_foolish_untaint`.
 
 Regarding the repository layout: There are two darcs repositories. One is the `srcdir`, the other we'll call `master`.


@@ -539,4 +542,10 @@ Regarding the repository layout: There are two darcs repositories. One is the `s
 > correctly that "adding" a file that's already in the repo should just be a no-op?
 > --pesco
 
 > correctly that "adding" a file that's already in the repo should just be a no-op?
 > --pesco
 

+>> It should result in the new file contents being committed by
+>> `rcs_commit_staged`. For some revision control systems, which
+>> automatically commit modifications, it would be a no-op. --[[Joey]]
+
+>>> Done. --pesco
+

 [[!tag patch]]
 [[!tag patch]]