You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/04/06 04:24:47 UTC
[3/5] git commit: Fix a reverse logic issue
Fix a reverse logic issue
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fe6abda4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fe6abda4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fe6abda4
Branch: refs/heads/2.6.x-fixes
Commit: fe6abda411306d2f69011794e92d373161380cbd
Parents: dd6b523
Author: Daniel Kulp <dk...@apache.org>
Authored: Sat Apr 5 21:38:23 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Sat Apr 5 21:58:00 2014 -0400
----------------------------------------------------------------------
bin/DoMerges.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/fe6abda4/bin/DoMerges.java
----------------------------------------------------------------------
diff --git a/bin/DoMerges.java b/bin/DoMerges.java
index f6fd9d0..830f6d5 100644
--- a/bin/DoMerges.java
+++ b/bin/DoMerges.java
@@ -592,10 +592,11 @@ public class DoMerges {
onBranch.add(s.trim());
}
}
+
List<String> ll = new ArrayList<String>();
for (String s : logLines) {
if (s.trim().length() > 0
- && !onBranch.remove(s.trim())
+ && onBranch.remove(s.trim())
&& !s.startsWith("Author: ")
&& !s.startsWith("Date: ")
&& !s.contains("git-svn-id")) {