allow bzr checkout in untrusted mrconfig too

diff --git a/debian/changelog b/debian/changelog
index 47fe6a12f0248f858f186fcf78abc82291220821..2d26a54ff06d7d579c865d2cef3f1f33806deeb1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,19 @@
 mr (1.05) unstable; urgency=low
 
 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.
   * 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
   * 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 in untrusted mrconfig files.
+  * 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
 
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Sep 2011 17:28:35 -0400
 

diff --git a/mr b/mr
index f947633b8b5e2a9285a31853c423a0b2c932a99e..abfa2e5187ec8d0512a6b612f0d7184cc5ecef89 100755 (executable)
--- a/mr
+++ b/mr
@@ -1824,7 +1824,7 @@ fossil_register =
 svn_trusted_checkout = svn co $url $repo
 svn_alt_trusted_checkout = svn checkout $url $repo
 git_trusted_checkout = git clone $url $repo
 svn_trusted_checkout = svn co $url $repo
 svn_alt_trusted_checkout = svn checkout $url $repo
 git_trusted_checkout = git clone $url $repo

-bzr_trusted_checkout = bzr clone|branch|get $url $repo
+bzr_trusted_checkout = bzr checkout|clone|branch|get $url $repo

 # cvs: too hard
 hg_trusted_checkout = hg clone $url $repo
 darcs_trusted_checkout = darcs get $url $repo
 # cvs: too hard
 hg_trusted_checkout = hg clone $url $repo
 darcs_trusted_checkout = darcs get $url $repo