diff options
| author | Simon McVittie <smcv@debian.org> | 2012-03-18 15:31:41 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2012-03-18 15:31:41 +0000 |
| commit | 4e54fa1144065b7ff99e88e6c61ff1fdcf6175c9 (patch) | |
| tree | 6759b80b8722ea532385c9a3ccc74897b784967d /doc/rcs/cvs/discussion.mdwn | |
| parent | d70ba7cff3fc6cc78ea2f8eb0713212478ab6ba7 (diff) | |
| parent | 0a9bb3edc2a9819ba87de1b6e57155120b6aba44 (diff) | |
| download | ikiwiki-4e54fa1144065b7ff99e88e6c61ff1fdcf6175c9.tar ikiwiki-4e54fa1144065b7ff99e88e6c61ff1fdcf6175c9.tar.gz | |
Merge tag '3.20120202' into trail3-integrated
Diffstat (limited to 'doc/rcs/cvs/discussion.mdwn')
| -rw-r--r-- | doc/rcs/cvs/discussion.mdwn | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn index 645b2388b..e10892e7d 100644 --- a/doc/rcs/cvs/discussion.mdwn +++ b/doc/rcs/cvs/discussion.mdwn @@ -147,3 +147,26 @@ 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]] + +Never mind, I was able to convince myself (by cloning `origin` +afresh and merging from `schmonz/cvs`). The history is a little +gross but the before-and-after diff looks right. + +Bugs found and fixed so far: + +* Stop treating text files as binary (`-kb`) on `rcs_add()` + (ac8eab29e8394aca4c0b23a6687ec947ea1ac869) + +> Merged to current head. --[[Joey]] |