svn commit: r1355417 - /cxf/branches/2.6.x-fixes/bin/DoMerges.java

[dkulp]

Author: dkulp
Date: Fri Jun 29 14:37:44 2012
New Revision: 1355417

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

........
  r1355405 | dkulp | 2012-06-29 10:21:14 -0400 (Fri, 29 Jun 2012) | 2 lines

  Make the diff based "changes" have the proper direction +/-

........

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=1355417&r1=1355416&r2=1355417&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/bin/DoMerges.java (original)
+++ cxf/branches/2.6.x-fixes/bin/DoMerges.java Fri Jun 29 14:37:44 2012
@@ -425,7 +425,7 @@ public class DoMerges {
         Process p;
         if (isGit) {
             String id = getGitVersion(ver);
-            p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", 
"diff", id + "^", id, gitSource}));
+            p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", 
"diff", "-R", id + "^", id, gitSource}));
         } else {
             p = Runtime.getRuntime().exec(getCommandLine(new String[] {"svn", 
"diff", "-c", Integer.toString(ver), svnRoot}));
         }