aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2013-01-27 22:59:49 -0500
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2013-01-27 22:59:49 -0500
commit786cf4653392df0929d5ea2b8d68c623075b1000 (patch)
treef24cb6c27e7c7e0c650fe664c42c120dfb601f64
parenta7131ffc3e38d27fb7e64fa528a63fae61fa5720 (diff)
downloadikiwiki-786cf4653392df0929d5ea2b8d68c623075b1000.tar
ikiwiki-786cf4653392df0929d5ea2b8d68c623075b1000.tar.gz
old and new cvs goodies needing merging
-rw-r--r--doc/rcs/cvs/discussion.mdwn22
1 files changed, 17 insertions, 5 deletions
diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn
index fdd2fbfd4..ee9e3b812 100644
--- a/doc/rcs/cvs/discussion.mdwn
+++ b/doc/rcs/cvs/discussion.mdwn
@@ -171,8 +171,20 @@ Bugs found and fixed so far:
> Merged to current head. --[[Joey]]
-* Return bounded output from `rcs_diff()` when asked, as the API states.
- (6753235d98a3903364af26c0614106c47d93ae35)
-* When adding a text file under a name formerly tracked as binary,
- fix CVS keyword substitution behavior by explicitly setting `-kkv`.
- (e45175d5454cc72b261507260accb309f13b5e8b)
+----
+
+Hi! Bugfixes in `schmonz/cvs` I'd like to see merged:
+
+* `6753235d`: Return bounded output from `rcs_diff()` when asked, as
+ the API states.
+
+* `e45175d5`: Always explicitly set CVS keyword substitution behavior.
+ Fixes behavior when a text file is added under a name formerly
+ used for a binary file.
+
+* `b30cacdf`: If the previous working directory no longer exists after
+ a CVS operation, don't try to `chdir()` back to it afterward.
+
+These are all the diffs that exist on the branch, so if the changes
+are acceptable you should be able to simply merge the branch.
+--[[schmonz]]