Skip to content

Commit

Permalink
Add a "-from" to my script to provide a starting point
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/cxf/trunk@1423657 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
dkulp committed Dec 18, 2012
1 parent 7d5f707 commit c455774
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions bin/DoMerges.java
Original file line number Diff line number Diff line change
Expand Up @@ -732,9 +732,12 @@ public static void main (String args[]) throws Exception {
}

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]);
}
Expand All @@ -758,6 +761,15 @@ public static void main (String args[]) throws Exception {
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);
Expand Down

0 comments on commit c455774

Please sign in to comment.