Author: alessio.soldano(a)jboss.com Date: 2013-06-21 13:39:26 -0400 (Fri, 21 Jun 2013) New Revision: 17720 Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/README-COMMITTERS Log: Adding info on how to merge stuff from shared testsuite in jbws-cxf upstream Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/README-COMMITTERS =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/README-COMMITTERS 2013-06-21 17:38:07 UTC (rev 17719) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/README-COMMITTERS 2013-06-21 17:39:26 UTC (rev 17720) @@ -2,3 +2,15 @@ * If you are using Eclipse then set your check style to eclipse/jboss-format.xml. * According to http://community.jboss.org/wiki/CopyrightOwnershipandLicenses ensure you're putting correct license headers to Java and XML files. + + + How to merge shared-testsuite changes from jbossws-cxf trunk + ------------------------------------------------------------ + +The jbossws-shared-testsuite project has been removed upstream and the testsuite +copied into the jbossws-cxf stack. In order for merging changes, the following +procedure is suggested: +1) generate a diff file in jbossws-cxf stack: 'svn diff -r rev1:rev2 > mydiff.diff' +2) move to maintenance branch of jbossws-shared-testsuite +3) move to the testsuite: 'cd testsuite' +4) patch using diff file: 'patch -p3 < /path/mydiff.diff'