cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1245609 - /cxf/trunk/bin/DoMerges.java
Date Fri, 17 Feb 2012 15:27:30 GMT
Author: dkulp
Date: Fri Feb 17 15:27:30 2012
New Revision: 1245609

URL: http://svn.apache.org/viewvc?rev=1245609&view=rev
Log:
SVN 1.7.2 seems to need an up after a commit or various parts of the
directory tree get out of sync and will refuse to merge anything again.

Modified:
    cxf/trunk/bin/DoMerges.java

Modified: cxf/trunk/bin/DoMerges.java
URL: http://svn.apache.org/viewvc/cxf/trunk/bin/DoMerges.java?rev=1245609&r1=1245608&r2=1245609&view=diff
==============================================================================
--- cxf/trunk/bin/DoMerges.java (original)
+++ cxf/trunk/bin/DoMerges.java Fri Feb 17 15:27:30 2012
@@ -343,6 +343,8 @@ public class DoMerges {
             p = Runtime.getRuntime().exec(new String[] {"git", "commit", "-a", "-F", file.toString()});
         } else {
             p = Runtime.getRuntime().exec(new String[] {"svn", "commit", "-F", file.toString()});
+            runProcess(p);
+            p = Runtime.getRuntime().exec(new String[] {"svn", "up"});
         }
         runProcess(p);
         return true;
@@ -524,6 +526,8 @@ public class DoMerges {
                                                                        logF.toString(),
                                                                        checkout.toString()}));
             runProcess(p);
+            p = Runtime.getRuntime().exec(new String[] {"svn", "up"});
+            runProcess(p);
         }
         blocks.clear();
         records.clear();
@@ -536,7 +540,7 @@ public class DoMerges {
             p = Runtime.getRuntime().exec(new String[] {"git", "svn", "rebase"});
             runProcess(p);
         } else {
-            Process p = Runtime.getRuntime().exec(new String[] {"svn", "up", "-r", "head",
"."});
+            Process p = Runtime.getRuntime().exec(new String[] {"svn", "up", "-r", "head"});
             runProcess(p);
         }
     }



Mime
View raw message