On Thu, Jun 26, 2008 at 2:41 AM, Luciano Resende <[EMAIL PROTECTED]> wrote:
> I have noticed that we are missing some merges between SCA 1.3 and trunk. > > I'd really recommend and encourage merging the fixes together with the > original committ. See below how easy the merge steps are. > > The following steps merge a given revision from 1.3 branch your local > checkout (e.g trunk). Merging from trunk is also easy, just change the > SVN URL that you use on the SVN merge command. > > 1.Identify the revision (or revisions) that you want to merge. > e.g.: revision 671193 from 1.3 branch > > 2.move to your local checkout, where you want to merge the changes > > 3.Use svn to merge the revision to your local checkout > svn merge -r 671192:671193 > https://svn.apache.org/repos/asf/tuscany/branches/sca-java-1.3/ > > -- > Luciano Resende > Apache Tuscany Committer > http://people.apache.org/~lresende <http://people.apache.org/%7Elresende> > http://lresende.blogspot.com/ > +1 I suspect most of the change you refer to are my changes.As you say the actualy merge is very easy. The problem I have is the length it takes to do a full build. I've been collecting up changes in my local version of trunk but, as you might expect, I'm repeatedly doing builds of 1.3 and haven't quite found a spare 90 minutes to do a full trunk build and ensure that nothing is broken. Simon
