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

[dkulp]

Author: dkulp
Date: Wed Feb 15 15:45:53 2012
New Revision: 1244546

URL: http://svn.apache.org/viewvc?rev=1244546&view=rev
Log:
Change how cherry-pick is called and print the running command in a form that 
allows copy/paste for testing

Modified:
    cxf/trunk/bin/DoMerges.java

Modified: cxf/trunk/bin/DoMerges.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/bin/DoMerges.java?rev=1244546&r1=1244545&r2=1244546&view=diff
==============================================================================
--- cxf/trunk/bin/DoMerges.java (original)
+++ cxf/trunk/bin/DoMerges.java Wed Feb 15 15:45:53 2012
@@ -599,7 +599,7 @@ public class DoMerges {
             String id = getGitVersion(ver);
             p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", 
"cherry-pick",
                                                                        
"--no-commit", 
-                                                                       id, 
gitSource}));
+                                                                       id}));
         } else {
             p = Runtime.getRuntime().exec(getCommandLine(new String[] {"svn", 
"merge", "--non-interactive",
                                                                        "-c", 
ver, svnSource}));
@@ -731,7 +731,17 @@ public class DoMerges {
         }
 
         argLine.addAll(Arrays.asList(args));
-        System.out.println("Running " + argLine + "...");
+        StringBuilder b = new StringBuilder(256);
+        for (String s : argLine) {
+            if (b.length() == 0) {
+                b.append("Running \"");
+            } else {
+                b.append(" ");
+            }
+            b.append(s);
+        }
+        b.append("\"...");
+        System.out.println(b.toString());
         return argLine.toArray(new String[argLine.size()]);
     }