summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-12-29 23:01:50 +0000
committerZac Medico <zmedico@gentoo.org>2008-12-29 23:01:50 +0000
commit7e65edf142301a418e9956492176b4fad90f4cf6 (patch)
treecbebf310847eeab0123f8065e70c6c18df3163a3
parentcce5f1bc07f75e1582f98d1de3958c6d7fd142c0 (diff)
downloadportage-7e65edf142301a418e9956492176b4fad90f4cf6.tar.gz
portage-7e65edf142301a418e9956492176b4fad90f4cf6.tar.bz2
portage-7e65edf142301a418e9956492176b4fad90f4cf6.zip
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
-rwxr-xr-xbin/repoman3
1 files changed, 3 insertions, 0 deletions
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]))