cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1302743 - /cxf/trunk/bin/DoMerges.java
Date Tue, 20 Mar 2012 01:21:40 GMT
Author: dkulp
Date: Tue Mar 20 01:21:40 2012
New Revision: 1302743

URL: http://svn.apache.org/viewvc?rev=1302743&view=rev
Log:
Don't log the full message for the "records".  Just clutters the svn
page in JIRA as we already have it recorded there from the original
merge.

Modified:
    cxf/trunk/bin/DoMerges.java

Modified: cxf/trunk/bin/DoMerges.java
URL: http://svn.apache.org/viewvc/cxf/trunk/bin/DoMerges.java?rev=1302743&r1=1302742&r2=1302743&view=diff
==============================================================================
--- cxf/trunk/bin/DoMerges.java (original)
+++ cxf/trunk/bin/DoMerges.java Tue Mar 20 01:21:40 2012
@@ -491,7 +491,7 @@ public class DoMerges {
                 merged.addRange(new Range(s.ver));
             }
             System.out.println("Recording " + ver);
-            File logF = getLogFile("Recording", ver.toString(), records);
+            File logF = getLogFile("Recording", ver.toString(), new ArrayList<VerLog>());
             p = Runtime.getRuntime().exec(getCommandLine(new String[] {"svn", "propset",
                                                                        "svnmerge-integrated",
                                                                        merged.toProperty(),
@@ -657,6 +657,12 @@ public class DoMerges {
     }
     
     public static void main (String args[]) throws Exception {
+        File file = new File("svnmerge-commit-message.txt");
+        if (file.exists()) {
+            //make sure we delete this to not cause confusion
+            file.delete();
+        }
+        
         int onlyVersion = -1;
         if (args.length > 0) {
             if ("-auto".equals(args[0])) { 
@@ -665,7 +671,7 @@ public class DoMerges {
                 onlyVersion = Integer.valueOf(args[0]);
             }
         }
-        File file = new File(".git");
+        file = new File(".git");
         if (file.exists() && file.isDirectory()) {
             isGit = true;
         }



Mime
View raw message