bzr: bzr rm no longer has a --force option, remove

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 72552abccaa96212c5f71d48cefcbb1b21e4498b..99a07d2c0eb2afa5512f6fc96043df6ff24171ff 100644 (file)
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -195,7 +195,7 @@ sub rcs_add ($) {
 sub rcs_remove ($) {
        my ($file) = @_;
 
 sub rcs_remove ($) {
        my ($file) = @_;
 

-       my @cmdline = ("bzr", "rm", "--force", "--quiet", "$config{srcdir}/$file");
+       my @cmdline = ("bzr", "rm", "--quiet", "$config{srcdir}/$file");

        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }

diff --git a/debian/changelog b/debian/changelog
index 07d955bb209defa61fc3b486bccd554168e50618..33795a5daa218b5e21a3fd033734808e42fa5e90 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20130505) UNRELEASED; urgency=low
+ikiwiki (3.20130518) unstable; urgency=low

 
   * Fix test suite to not fail when XML::Twig is not installed.
     Closes: #707436
 
   * Fix test suite to not fail when XML::Twig is not installed.
     Closes: #707436


@@ -6,8 +6,9 @@ ikiwiki (3.20130505) UNRELEASED; urgency=low
     a theme is enabled.
   * notifyemail: Fix bug that caused duplicate emails to be sent when
     site was rebuilt.
     a theme is enabled.
   * notifyemail: Fix bug that caused duplicate emails to be sent when
     site was rebuilt.

+  * bzr: bzr rm no longer has a --force option, remove

 
 

- -- Joey Hess <joeyh@debian.org>  Thu, 09 May 2013 10:47:18 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 18 May 2013 16:28:21 -0400

 
 ikiwiki (3.20130504) unstable; urgency=low
 
 
 ikiwiki (3.20130504) unstable; urgency=low