From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 3 Feb 2008 22:04:58 +0000 (-0500)
Subject: * Update bzr registration code to work with current version of bzr,
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/a2b2ee1876593afb1235652397d2194ef704e3b5

* Update bzr registration code to work with current version of bzr,
  using bzr info to get the url. Closes: #463867
---

diff --git a/debian/changelog b/debian/changelog
index 92586f5..250b33c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mr (0.22) UNRELEASED; urgency=low
+
+  * Update bzr registration code to work with current version of bzr,
+    using bzr info to get the url. Closes: #463867
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 03 Feb 2008 17:04:30 -0500
+
 mr (0.21) unstable; urgency=low
 
   * Add a git-svn file, which can be included to add support for git-svn
diff --git a/mr b/mr
index 33bde35..87618a2 100755
--- a/mr
+++ b/mr
@@ -1243,7 +1243,7 @@ git_register =
 	echo "Registering git url: $url in $MR_CONFIG"
 	mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone '$url' '$MR_REPO'"
 bzr_register =
-	url=`cat .bzr/branch/parent`
+	url="`LC_ALL=C bzr info . | egrep -i 'checkout of branch|parent branch' | awk '{print $NF}'`"
 	if [ -z "$url" ]; then
 		error "cannot determine bzr url"
 	fi