From 7e65edf142301a418e9956492176b4fad90f4cf6 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 29 Dec 2008 23:01:50 +0000
Subject: Handle tree conflicts in svn status output, new in subversion 1.6.
 Thanks to Arfrever Frehtes Taifersar Arahesis for reporting.

svn path=/main/trunk/; revision=12368
---
 bin/repoman | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bin')

diff --git a/bin/repoman b/bin/repoman
index a2d7d8bc2..84a023561 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]))
-- 
cgit v1.2.3-1-g7c22