| 1 |
Author: zmedico |
| 2 |
Date: 2008-12-29 23:01:50 +0000 (Mon, 29 Dec 2008) |
| 3 |
New Revision: 12368 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/repoman |
| 7 |
Log: |
| 8 |
Handle tree conflicts in svn status output, new in subversion 1.6. Thanks to |
| 9 |
Arfrever Frehtes Taifersar Arahesis for reporting. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/bin/repoman |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/bin/repoman 2008-12-29 22:51:42 UTC (rev 12367) |
| 15 |
+++ main/trunk/bin/repoman 2008-12-29 23:01:50 UTC (rev 12368) |
| 16 |
@@ -910,6 +910,9 @@ |
| 17 |
if vcs == "svn": |
| 18 |
if l[:1] == "?": |
| 19 |
continue |
| 20 |
+ if l[:7] == ' >': |
| 21 |
+ # tree conflict, new in subversion 1.6 |
| 22 |
+ continue |
| 23 |
l = l.split()[-1] |
| 24 |
if l[-7:] == ".ebuild": |
| 25 |
eadded.append(os.path.basename(l[:-7])) |
Archives