svn commit: r1244508 - /cxf/trunk/bin/DoMerges.java

[dkulp]

Author: dkulp
Date: Wed Feb 15 14:44:13 2012
New Revision: 1244508

URL: http://svn.apache.org/viewvc?rev=1244508&view=rev
Log:
Minor updates to work better with git and svn

Modified:
    cxf/trunk/bin/DoMerges.java

Modified: cxf/trunk/bin/DoMerges.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/bin/DoMerges.java?rev=1244508&r1=1244507&r2=1244508&view=diff
==============================================================================
--- cxf/trunk/bin/DoMerges.java (original)
+++ cxf/trunk/bin/DoMerges.java Wed Feb 15 14:44:13 2012
@@ -528,8 +528,8 @@ public class DoMerges {
         }
     }
 
-    public static List<String> getAvailableUpdates() throws Exception {
-        List<String> verList = new ArrayList<String>();
+    public static Set<String> getAvailableUpdates() throws Exception {
+        Set<String> verList = new LinkedHashSet<String>();
         Process p;
         BufferedReader reader;
         String line;
@@ -551,7 +551,7 @@ public class DoMerges {
         line = reader.readLine();
         while (line != null) {
             if (line.charAt(0) == 'r') {
-                line = line.substring(0, 
line.indexOf('|')).substring(1).trim();
+                line = line.substring(0, line.indexOf(' 
')).substring(1).trim();
                 int ver = Integer.parseInt(line);
                 if (!merged.isInRange(ver) && !blocked.isInRange(ver)) {
                     verList.add(line);
@@ -653,7 +653,7 @@ public class DoMerges {
         doUpdate();
         initSvnInfo();
         
-        List<String> verList = getAvailableUpdates();
+        Set<String> verList = getAvailableUpdates();
 
         System.out.println("Merging versions (" + verList.size() + "): " + 
verList);
 
@@ -662,9 +662,10 @@ public class DoMerges {
         Set<Integer> ignores = new TreeSet<Integer>();
         Set<String> jiras = new TreeSet<String>();
 
-        for (int cur = 0; cur < verList.size(); cur++) {
+        int cur = 0;
+        for (String ver : verList) {
+            cur++;
             jiras.clear();
-            String ver = verList.get(cur);
             System.out.println("Merging: " + ver + " (" + (cur + 1) + "/" + 
verList.size() + ")");
             
System.out.println("http://svn.apache.org/viewvc?view=revision&revision="; + 
ver);