cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1375642 - /cxf/branches/2.6.x-fixes/bin/DoMerges.java
Date Tue, 21 Aug 2012 16:13:40 GMT
Author: dkulp
Date: Tue Aug 21 16:13:40 2012
New Revision: 1375642

URL: http://svn.apache.org/viewvc?rev=1375642&view=rev
Log:
Merged revisions 1373482 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1373482 | dkulp | 2012-08-15 11:47:37 -0400 (Wed, 15 Aug 2012) | 2 lines

  Don't need the full log on blocks either... just pollutes the tabs in JIRA

........

Modified:
    cxf/branches/2.6.x-fixes/bin/DoMerges.java

Modified: cxf/branches/2.6.x-fixes/bin/DoMerges.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/bin/DoMerges.java?rev=1375642&r1=1375641&r2=1375642&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/bin/DoMerges.java (original)
+++ cxf/branches/2.6.x-fixes/bin/DoMerges.java Tue Aug 21 16:13:40 2012
@@ -522,7 +522,8 @@ public class DoMerges {
                 blocked.addRange(new Range(s.ver));
             }
             System.out.println("Blocking " + ver);
-            File logF = getLogFile("Blocking", ver.toString(), blocks);
+            //File logF = getLogFile("Blocking", ver.toString(), blocks);
+            File logF = getLogFile("Blocking", ver.toString(), new ArrayList<VerLog>());
             p = Runtime.getRuntime().exec(getCommandLine(new String[] {"svn", "propset",
                                                                        "svnmerge-blocked",
                                                                        blocked.toProperty(),



Mime
View raw message