cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [5/5] 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 Wed, 19 Mar 2014 19:07:14 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/39a0f586
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/39a0f586
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/39a0f586

Branch: refs/heads/2.7.x-fixes
Commit: 39a0f5868e0cb402b7f575d8da4fb3a6aa5efb53
Parents: 48d312c
Author: Daniel Kulp <dkulp@apache.org>
Authored: Wed Mar 19 15:03:47 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Wed Mar 19 15:06:15 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/39a0f586/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