X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/3d39c568b0f5559c4bf1e3c054588ca255c26e21..64e5b9721264d0d08f6348b61d7ca98f5fbea5c6:/debian/changelog?ds=sidebyside

diff --git a/debian/changelog b/debian/changelog
index 5199ab4..5e4cb7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,25 @@
+mr (1.06) UNRELEASED; urgency=low
+
+  * Fix propigation of failure from pre and post hooks and from fixups.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 27 Oct 2011 12:18:43 -0400
+
 mr (1.05) unstable; urgency=low
 
-  * Avoid using sed -r in git-fake-bare, for OSX portability.
-  * git-fake-bare: handle fake bare repositories with core.bare not set
-    (Thanks, Julien Rebetez)
   * README now gives a quick into to using mr.
   * Brought back the "deleted" parameter, which provides an easy way to
     mark repositories that should be removed.
   * Allow untrusted mrconfig files to set parameters to true/false.
-    So skip=true or deleted=true canbe used in an untrusted mrconfig file.
+    So skip=true or deleted=true can be used in an untrusted mrconfig file.
   * Also allow order=N in an untrusted mrconfig file.
   * Support bzr checkouts, which are updated with "bzr update",
     and to which bzr automatically pushes commits. Closes: #643589
+  * Use bzr branch, not deprecated bzr clone when registering bzr
+    repositories. Closes: #643591
+  * Allow bzr branch|clone|get|checkout in untrusted mrconfig files.
+  * Avoid using sed -r in git-fake-bare, for OSX portability.
+  * git-fake-bare: handle fake bare repositories with core.bare not set
+    (Thanks, Julien Rebetez)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Sep 2011 17:28:35 -0400