From: Joey Hess <joey@kitenet.net>
Date: Mon, 14 May 2012 14:39:40 +0000 (-0400)
Subject: Improve bzr register's heuristics to determine upstream repo. Closes: #672843
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/476df25d8c4712ed1a859820375420e4107d641c

Improve bzr register's heuristics to determine upstream repo. Closes: #672843
---

diff --git a/debian/changelog b/debian/changelog
index e311dc6..7632104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mr (1.12) UNRELEASED; urgency=low
     when there were no changes to pull. Closes: #661870 
   * Add vcsh to Suggests.
   * Recognize a repo with a .git file as a git repo.
+  * Improve bzr register's heuristics to determine upstream repo.
+    Closes: #672843
 
  -- Joey Hess <joeyh@debian.org>  Fri, 02 Mar 2012 00:33:08 -0400
 
diff --git a/mr b/mr
index 6fc5d57..556366c 100755
--- a/mr
+++ b/mr
@@ -1983,7 +1983,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="`LC_ALL=C bzr info . | egrep -i 'checkout of branch|parent branch' | awk '{print $NF}'`"
+	url="`LC_ALL=C bzr info . | egrep -i 'checkout of branch|parent branch' | awk '{print $NF}' | head -n 1`"
 	if [ -z "$url" ]; then
 		error "cannot determine bzr url"
 	fi