[jbossws-dev] Re: Working on branch/jbossws-2.0

[Darran Lofthouse]

I can't find a mergeinfo.txt in jbossws-2.0 - where should this live?

On Mon, 2007-06-04 at 19:15 +0200, Thomas Diesler wrote:
> Folks,
> 
> today we recreated branches/jbossws-2.0 from the trunk codebase and
> removed the sunri, xfire integration from it.
> 
> The QA is hosted here:
> 
> trunk:		 http://jbws.dyndns.org:8180/hudson/
> jbossws-2.0:	 http://jbws.dyndns.org:8280/hudson/
> 
> Note, the difference in port!
> 
> Since we cut jbossws-2.0 a couple of weeks ago, trunk has undergone
> significant structural changes because of our switch to the general WS
> integration layer. These changes are not necessarily functional.  Due to
> these changes we needed to realign the 2.0 branch with trunk otherwise
> the 2.0 code base would not be maintainable.
> 
> IMPORTANT!
> 
> You don't need to do anything if you immediately merged your changes
> from jbossws-2.0 to trunk when you did it. In that case your changes are
> preseved. However, if you did not merge your changes upstream because
> trunk was too much of a moving target or for whatever other reason you
> now need to manually merge your stuff to BOTH jbossws-2.0 and trunk.
> 
> I preserved a read-only copy of the old jbossws-2.0 code base here
> 
> https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0.backup/
> 
> Darran, Magesh, David please confirm that your changes are commited
> upstream. The attached svn.log should show what you have actually done.
> 
> Please remember, that SVN does not maintain a record of merges that have
> been done accross branches. We therefore maintain a mergeinfo.txt file
> for every branch that should contain the merge commands that have been
> issued. 
> 
> jbossws-2.0.0.GA is scheduled for 1-Jul-2007.
> 
> 'svn merge' can now easily be used again to merge your changes upstream
> to trunk. Please get back to me in case this procedure is not clear to
> you. 
> 
> Here again our dev rules - I'll post them to the wiki as well.
> 
> #1 Run 'ant tests-samples' before you commit
> #2 Merge your stuff upstream yourself - maintain a merge record
> #3 Include JIRA issue and title in SVN commit messages when applicable
> #4 Fix what your broke. Hudson should tell you at most 24h later
> 
> cheers
> -thomas
> 
> 
> 
> 
> 
> 
> 
> 
> 	
-- 

Regards,
Darran Lofthouse.

Senior Software Maintenance Engineer
JBoss, a division of Red Hat

+41 32 720 92 60