update on some of the conflict cases

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

diff --git a/doc/todo/bzr.mdwn b/doc/todo/bzr.mdwn
index 36e37d90ea8a0f44e6e0fd5ed903294841d5de85..179ea2f24db7ced98c4838858af9c14277c8d668 100644 (file)
--- a/doc/todo/bzr.mdwn
+++ b/doc/todo/bzr.mdwn
@@ -4,6 +4,8 @@ rcs_commit was only changed to work around bzr's lack of a switch to set the
 username). bzr_log could probably be written better by someone better at perl,
 and rcs_getctime and rcs_notify aren't written at all. --[[bma]]
 
+(rcs_notify is not needed in this branch --[[Joey]])
+
     #!/usr/bin/perl
     
     use warnings;
@@ -180,3 +182,13 @@ and rcs_getctime and rcs_notify aren't written at all. --[[bma]]
 >> I didn't know about --author, it doesn't seem to be mentioned in the manual.
 >> I'd update the patch to reflect this, but it breaks with the version of bzr
 >> from Stable, and also the one I'm currently using from backports.org.
+
+>>> It's new (in fact I'm not even sure that it made it in to 0.90, it might be in 0.91 due
+>>> in a couple of weeks.
+>>> I was just noting it for a future enhancement. --[[JamesWestby]]
+
+> I've just posted another patch with support for bzr, including support for 
+> --author and a testsuite to git://git.samba.org/jelmer/ikiwiki.git. I hadn't 
+> seen this page earlier.  --[[jelmer]]
+
+> I used jelmer's patch --[[done]]! --[[Joey]]