From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 12 Jan 2009 08:09:20 +0000 (-0000)
Subject: Handle tree conflicts in svn status output, new in subversion 1.6. Thanks to
X-Git-Tag: v2.1.6.5~48
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0b75f0cfbdab366055a1be368f9db46397e44dd3;p=portage.git

Handle tree conflicts in svn status output, new in subversion 1.6. Thanks to
Arfrever Frehtes Taifersar Arahesis for reporting. (trunk r12368)

svn path=/main/branches/2.1.6/; revision=12439
---

diff --git a/bin/repoman b/bin/repoman
index 1e1bc229a..6e8b3848e 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -910,6 +910,9 @@ for x in scanlist:
 				if vcs == "svn":
 					if l[:1] == "?":
 						continue
+					if l[:7] == '      >':
+						# tree conflict, new in subversion 1.6
+						continue
 					l = l.split()[-1]
 					if l[-7:] == ".ebuild":
 						eadded.append(os.path.basename(l[:-7]))