From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 16 Apr 2009 17:12:25 +0000 (-0400)
Subject: Use pass --pull to bzr merge to avoid needing to commit merged changes. Closes: ... 
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/ba5e0ca2eca4d80aefc362d4aabd531d3ed4c0d0

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

diff --git a/debian/changelog b/debian/changelog
index 34636e2..8764a34 100644
--- 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)
diff --git a/mr b/mr
index e2f9dae..a897a5f 100755
--- a/mr
+++ b/mr
@@ -1275,7 +1275,7 @@ git_bare_test =
 
 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 "$@"