* Always call rcs_update after a commit during a web edit, to work around

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 483d14b1238d4535e13877ce759c9cf9936b2785..cd134a2c7607b2c286b15e83040a1405f5f54515 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,14 @@ ikiwiki (1.41) UNRELEASED; urgency=low
   * Make gitorigin_branch and gitmaster_branch configurable via the setup
     file. Closes: #408599
   * French translation update. Closes: #408593
-
- -- Joey Hess <joeyh@debian.org>  Sat, 27 Jan 2007 18:56:49 -0500
+  * Improve use of svn merge, by specifying the file to merge, rather than
+    chdiring to the srcdir (which wasn't right when merging in a subdir).
+    Thanks Ethan.
+  * Always call rcs_update after a commit during a web edit, to work around
+    the problem described in bugs/svn_fails_to_update. Thanks to Ethan for the
+    analysis and patch.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 27 Jan 2007 19:18:27 -0500
 
 ikiwiki (1.40) unstable; urgency=low