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 2009/09/02 16:16:44 UTC
svn commit: r810515 - in /cxf/branches/2.2.x-fixes: ./ bin/DoMerges.java
Author: dkulp
Date: Wed Sep 2 14:16:43 2009
New Revision: 810515
URL: http://svn.apache.org/viewvc?rev=810515&view=rev
Log:
Merged revisions 810513 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r810513 | dkulp | 2009-09-02 10:12:20 -0400 (Wed, 02 Sep 2009) | 2 lines
Update my merge scripty thing to do all the blocks in a batch at the end
to make it quicker
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/bin/DoMerges.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 2 14:16:43 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858
4,798654,798748-798749,798816,798891,798929-798930,799245,799267,799439,799448,799637,799723-799724,799792,800453,800497-800498,801380-801381,801447,801962,802892,803056,803129,803174,803419,803460,803493,803689,804002,804175,804276,805784,805907,805909,806020-806021,806023,806405-806406,806576,806602-806604,806620,806627,806631,806633,806638,806687,806876,806922,806979-806982,807181,807205,807295,807748,807807,808035,808069,808085,808107,808464,808488,808731,808885,808925,809082-809083,809162,809190,809417-809626,809631,809663,809706,809738,809962,810090,810143,810349,810376
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858
4,798654,798748-798749,798816,798891,798929-798930,799245,799267,799439,799448,799637,799723-799724,799792,800453,800497-800498,801380-801381,801447,801962,802892,803056,803129,803174,803419,803460,803493,803689,804002,804175,804276,805784,805907,805909,806020-806021,806023,806405-806406,806576,806602-806604,806620,806627,806631,806633,806638,806687,806876,806922,806979-806982,807181,807205,807295,807748,807807,808035,808069,808085,808107,808464,808488,808731,808885,808925,809082-809083,809162,809190,809417-809626,809631,809663,809706,809738,809962,810090,810143,810349,810376,810513
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/bin/DoMerges.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/bin/DoMerges.java?rev=810515&r1=810514&r2=810515&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/bin/DoMerges.java (original)
+++ cxf/branches/2.2.x-fixes/bin/DoMerges.java Wed Sep 2 14:16:43 2009
@@ -140,6 +140,7 @@
System.out.println("Root: " + root);
p.waitFor();
+ List<String> blocks = new ArrayList<String>();
int count = 1;
for (String ver : verList) {
@@ -188,29 +189,41 @@
doCommit();
break;
case 'B':
- p = Runtime.getRuntime().exec(getCommandLine(new String[] {"svnmerge.py", "block", "-r", ver}));
- reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ blocks.add(ver);
+ break;
+ case 'I':
+ System.out.println("Ignoring");
+ break;
+ }
+ }
+
+ if (!blocks.isEmpty()) {
+ StringBuilder ver = new StringBuilder();
+ for (String s : blocks) {
+ if (ver.length() > 0) {
+ ver.append(',');
+ }
+ ver.append(s);
+ }
+ System.out.println("Blocking " + ver);
+ p = Runtime.getRuntime().exec(getCommandLine(new String[] {"svnmerge.py", "block", "-r", ver.toString()}));
+ reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ line = reader.readLine();
+ while (line != null) {
+ System.out.println(line);
+ line = reader.readLine();
+ }
+ if (p.waitFor() != 0) {
+ System.out.println("ERROR!");
+ reader = new BufferedReader(new InputStreamReader(p.getErrorStream()));
line = reader.readLine();
while (line != null) {
System.out.println(line);
line = reader.readLine();
}
- if (p.waitFor() != 0) {
- System.out.println("ERROR!");
- reader = new BufferedReader(new InputStreamReader(p.getErrorStream()));
- line = reader.readLine();
- while (line != null) {
- System.out.println(line);
- line = reader.readLine();
- }
- System.exit(1);
- }
- doCommit();
- break;
- case 'I':
- System.out.println("Ignoring");
- break;
+ System.exit(1);
}
+ doCommit();
}
}