> -----Original Message----- > From: Thorsten Scherler [mailto:thorsten.scherler....@juntadeandalucia.es] > Sent: Monday, 16 February 2009 6:30 PM > To: dev@forrest.apache.org > Subject: Re: [HeadsUp] next steps for dispatcher integration - please test > > On Sun, 2009-02-15 at 15:57 +1100, David Crossley wrote: > > Thorsten Scherler wrote: > ... > > > > Since I have done the whole work in a branch I need to merge it > ASAP. I > > > > suspect that the merge will not be fully conflict free since there > has > > > > been some commits to the trunk of contracts that are not in the > branch. > > > > > > Since I did not merged the branches right away the recent work of > Gavin > > > and David on the html/css validation compatibility is not incorporated > > > when I simply merge the branches. Bummer. > > > > I am no branching expert, but can you merge the changes from > > trunk into your branch. When all is well you then merge > > branch to trunk. > > http://svn.apache.org/viewcvs?view=rev&rev=701113 > > The problem is that they have moved they place with the first commit. To > workaround that results in nearly the the same work as doing it again > from the start. Maybe somebody has an idea to overcome this problem? > without to repeat it all.
http://svnbook.red-bean.com/en/1.0/re16.html "...If you branched at revision 23, and you want to merge changes on trunk into your branch, you could do this from inside the working copy of your branch: $ svn merge -r 23:30 file:///tmp/repos/trunk/vendors U myproj/thhgttg.txt..." >From that I gather that you can merge the changes we did after you branched into your working copy. Then if all is well, you can merge you branch back into trunk again. However, I have not looked at your code yet, and the above assumes that the code that I and David have added are still compatible code in the first place. Gav... > > > > At the moment i don't have time to test, or to comment > > on your plan. So i hope that other developers do. > > Thank you for your comment. > > salu2 > -- > Thorsten Scherler <thorsten.at.apache.org> > Open Source Java <consulting, training and solutions> > > Sociedad Andaluza para el Desarrollo de la Sociedad > de la Información, S.A.U. (SADESI) > >
