diff options
| author | Joey Hess <joey@kitenet.net> | 2013-05-18 16:33:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-18 16:33:32 -0400 |
| commit | 07d39ce5bf320940c210b0e67dd293c43351cd47 (patch) | |
| tree | 140331612f6f7542cb301309e5d1e7e6abdd29ef | |
| parent | 239c37989d4fb3e94c4c6db841a49a79b9ea040f (diff) | |
| download | ikiwiki-07d39ce5bf320940c210b0e67dd293c43351cd47.tar ikiwiki-07d39ce5bf320940c210b0e67dd293c43351cd47.tar.gz | |
bzr: bzr rm no longer has a --force option, remove
| -rw-r--r-- | IkiWiki/Plugin/bzr.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm index 72552abcc..99a07d2c0 100644 --- a/IkiWiki/Plugin/bzr.pm +++ b/IkiWiki/Plugin/bzr.pm @@ -195,7 +195,7 @@ sub rcs_add ($) { 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: $!"; } diff --git a/debian/changelog b/debian/changelog index 07d955bb2..33795a5da 100644 --- 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 @@ -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. + * 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 |