cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [05/12] git commit: If git cherry-pick doesn't have a conflict, we dont need to "record" the merge as "git cherry" will detect it
Date Thu, 20 Mar 2014 20:46:58 GMT
If git cherry-pick doesn't have a conflict, we dont need to "record" the merge as "git cherry"
will detect it


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

Branch: refs/heads/2.6.x-fixes
Commit: fdc0e6e5c6d0aeeffab0a477267077566098b459
Parents: e386210
Author: Daniel Kulp <dkulp@apache.org>
Authored: Wed Mar 19 15:03:47 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Thu Mar 20 16:45:09 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/fdc0e6e5/bin/DoMerges.java
----------------------------------------------------------------------
diff --git a/bin/DoMerges.java b/bin/DoMerges.java
index 1fb9b0d..737cd3b 100644
--- a/bin/DoMerges.java
+++ b/bin/DoMerges.java
@@ -313,8 +313,6 @@ public class DoMerges {
             if (doCommit()) {
                 records.add("M " + ver);
             }
-        } else {
-            records.add("M " + ver);
         }
     }
     private static void doMappedMerge(String ver) throws Exception {


Mime
View raw message