Use pass --pull to bzr merge to avoid needing to commit merged changes. Closes: ...

diff --git a/debian/changelog b/debian/changelog
index 34636e2bdfe770574e4454fd74efebbc14e15f8f..8764a34a59c2c5fbea9d9ba59a473cd28d967866 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mr (0.40) UNRELEASED; urgency=low
+
+  * Use pass --pull to bzr merge to avoid needing to commit
+    merged changes. Closes: #524352
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 16 Apr 2009 13:11:53 -0400
+

 mr (0.39) unstable; urgency=low
 
   * Determine current branch for fake-bare update (martin f. krafft)
 mr (0.39) unstable; urgency=low
 
   * Determine current branch for fake-bare update (martin f. krafft)

diff --git a/mr b/mr
index e2f9daeb9a495b7eb7fa52dece3c5beef3faac7e..a897a5fdde3f3d87158bd05d962d72ac79c131a2 100755 (executable)
--- a/mr
+++ b/mr
@@ -1275,7 +1275,7 @@ git_bare_test =
 
 svn_update = svn update "$@"
 git_update = git pull "$@"
 
 svn_update = svn update "$@"
 git_update = git pull "$@"

-bzr_update = bzr merge "$@"
+bzr_update = bzr merge --pull "$@"

 cvs_update = cvs update "$@"
 hg_update  = hg pull "$@" && hg update "$@"
 darcs_update = darcs pull -a "$@"
 cvs_update = cvs update "$@"
 hg_update  = hg pull "$@" && hg update "$@"
 darcs_update = darcs pull -a "$@"