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 1e1bc229a28ef6a6fc56715070b4bc29ff947b48..6e8b3848ee60b0446f3f685e711c32b4746c75fe 100755 (executable)
--- 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]))