Repository: cxf Updated Branches: refs/heads/master a4903d384 -> 6baced63c
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/6baced63 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6baced63 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6baced63 Branch: refs/heads/master Commit: 6baced63c9137416b13d2dbefd6a7495ace4bc01 Parents: a4903d3 Author: Daniel Kulp <[email protected]> Authored: Sat Apr 5 21:38:23 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Sat Apr 5 21:38:23 2014 -0400 ---------------------------------------------------------------------- bin/DoMerges.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6baced63/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")) {
