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 2012/12/19 17:51:23 UTC
svn commit: r1423939 - /cxf/branches/2.6.x-fixes/bin/DoMerges.java
Author: dkulp
Date: Wed Dec 19 16:51:22 2012
New Revision: 1423939
URL: http://svn.apache.org/viewvc?rev=1423939&view=rev
Log:
Merged revisions 1423657 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1423657 | dkulp | 2012-12-18 16:17:09 -0500 (Tue, 18 Dec 2012) | 2 lines
Add a "-from" to my script to provide a starting point
........
Modified:
cxf/branches/2.6.x-fixes/bin/DoMerges.java
Modified: cxf/branches/2.6.x-fixes/bin/DoMerges.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/bin/DoMerges.java?rev=1423939&r1=1423938&r2=1423939&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/bin/DoMerges.java (original)
+++ cxf/branches/2.6.x-fixes/bin/DoMerges.java Wed Dec 19 16:51:22 2012
@@ -732,9 +732,12 @@ public class DoMerges {
}
int onlyVersion = -1;
+ int fromVersion = -1;
if (args.length > 0) {
if ("-auto".equals(args[0])) {
auto = true;
+ } else if ("-from".equals(args[0])) {
+ fromVersion = Integer.valueOf(args[1]);
} else {
onlyVersion = Integer.valueOf(args[0]);
}
@@ -758,6 +761,15 @@ public class DoMerges {
verList.clear();
verList.add(onlyVersion);
}
+ if (fromVersion != -1) {
+ Iterator<Integer> it = verList.iterator();
+ while (it.hasNext()) {
+ Integer i = it.next();
+ if (i < fromVersion) {
+ it.remove();
+ }
+ }
+ }
if (verList.isEmpty()) {
System.out.println("Nothing needs to be merged");
System.exit(0);