cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject git commit: THe advanced merge was eating any JIRA ID's stuck in brackets
Date Sat, 22 Mar 2014 00:47:06 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 43e74adbd -> 0b21c66dc


THe advanced merge was eating any JIRA ID's stuck in brackets


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0b21c66d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0b21c66d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0b21c66d

Branch: refs/heads/master
Commit: 0b21c66dc0486643f481c9cf31757e2b3293de23
Parents: 43e74ad
Author: Daniel Kulp <dkulp@apache.org>
Authored: Fri Mar 21 20:46:37 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri Mar 21 20:46:37 2014 -0400

----------------------------------------------------------------------
 bin/DoMerges.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/0b21c66d/bin/DoMerges.java
----------------------------------------------------------------------
diff --git a/bin/DoMerges.java b/bin/DoMerges.java
index 4bb6d7c..17e5f97 100644
--- a/bin/DoMerges.java
+++ b/bin/DoMerges.java
@@ -299,7 +299,7 @@ public class DoMerges {
         }
     }
     private static void doMappedMerge(String ver) throws Exception {
-        Process p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "format-patch",
"--stdout", "-1", ver}));
+        Process p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "format-patch",
"--stdout", "-1", "-k", ver}));
         BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
         
         File outputFile = File.createTempFile("merge", ".patch");
@@ -331,7 +331,7 @@ public class DoMerges {
         writer.flush();
         writer.close();
         
-        p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "am", outputFile.getCanonicalPath()}));
+        p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "am", "-k", outputFile.getCanonicalPath()}));
         
         if (waitFor(p, false) != 0) {
             p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "status"}));


Mime
View raw message