Repository: cxf Updated Branches: refs/heads/2.6.x-fixes f24c03ce0 -> 7e5095b47
Auto block stuff we know will need to be blocked Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bb2330d7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bb2330d7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bb2330d7 Branch: refs/heads/2.6.x-fixes Commit: bb2330d7e8a223aa3584154e6d1c99da588b935c Parents: f24c03c Author: Daniel Kulp <[email protected]> Authored: Fri Feb 21 01:02:42 2014 -0500 Committer: Daniel Kulp <[email protected]> Committed: Mon Mar 17 11:18:04 2014 -0400 ---------------------------------------------------------------------- bin/DoMerges.java | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/bb2330d7/bin/DoMerges.java ---------------------------------------------------------------------- diff --git a/bin/DoMerges.java b/bin/DoMerges.java index bc03fa5..82d53be 100644 --- a/bin/DoMerges.java +++ b/bin/DoMerges.java @@ -27,7 +27,7 @@ import java.util.regex.Pattern; svn to be available on the path. If using a git checkout, it also requires the command line version of git on the path. - Basically, svn does all the work, but this little wrapper + Basically, git does all the work, but this little wrapper thing will display the commit logs, prompt if you want to merge/block/ignore each commit, prompt for commit (so you can resolve any conflicts first), etc.... @@ -50,7 +50,7 @@ import java.util.regex.Pattern; [R]ecord formally records that a merge occurred, but it does *not* actually merge the commit. This is useful if you another tool to do - the merging (such as Git) but still wish to record a merge did occur. + the merging but still wish to record a merge did occur. [F]lush will permanently save all the [B]'s and [R]'s you've earlier made, useful when you need to stop DoMerges (due to a missed commit or other @@ -253,7 +253,6 @@ public class DoMerges { if (s.contains("[maven-release-plugin] prepare")) { return; } - } map.add(list.toArray(new String[list.size()])); } @@ -387,6 +386,10 @@ public class DoMerges { System.out.println("https://issues.apache.org/jira/browse/"; + s); } StringBuilder log = new StringBuilder(); + if (isBlocked(logLines)) { + records.add("B " + ver); + continue; + } for (String s : logLines) { System.out.println(s); log.append(s).append("\n"); @@ -444,6 +447,17 @@ public class DoMerges { } flush(); } + private static boolean isBlocked(String[] logLines) { + for (String s: logLines) { + if (s.trim().contains("Recording .gitmergeinfo Changes")) { + return true; + } + if (s.contains("[maven-release-plugin] prepare")) { + return true; + } + } + return false; + } private static boolean checkPatchId(String ver) throws Exception { if (!patchIds.isEmpty()) { String pid = getPatchId(ver);
