aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2012-01-22 20:42:00 -0500
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2012-01-22 20:42:00 -0500
commitc7c43cccbabc74f2623ffb7b49674b753562f80d (patch)
tree0c6bc840813948d8b4ec77814895315e95906e72
parenta64b224f524bcef95fc3befeb3e66a854f9e3bff (diff)
parent0d0b87be5829e3e5671291a643bb4495a4cc7b99 (diff)
downloadikiwiki-c7c43cccbabc74f2623ffb7b49674b753562f80d.tar
ikiwiki-c7c43cccbabc74f2623ffb7b49674b753562f80d.tar.gz
Merge branch 'master' into cvs
-rw-r--r--doc/rcs/cvs/discussion.mdwn12
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn
index 645b2388b..2df2c1317 100644
--- a/doc/rcs/cvs/discussion.mdwn
+++ b/doc/rcs/cvs/discussion.mdwn
@@ -147,3 +147,15 @@ short and clear as possible. --[[schmonz]]
> that. --[[Joey]]
>> Done. --[[schmonz]].
+
+----
+
+I'm attempting to bring some polish to this plugin, starting with
+fuller test coverage. In preparation, I've refactored the tests a
+bunch (and shuffled the code a bit) in my branch. I'm worried,
+however, that my misunderstanding of `git rebase` may have made my
+branch harder for you to pull.
+
+Before I go writing a whole swack of test cases, could you merge
+my latest? Through at least ad0e56cdcaaf76bc68d1b5c56e6845307b51c44a
+there should be no functional change. --[[schmonz]]