On Thu, Sep 22, 2011 at 11:12 AM, Daniel Kulp <dk...@apache.org> wrote:
> On Thursday, September 22, 2011 10:55:58 AM Jon Anstey wrote: > > Hmm.. looks like the svnmerge metadata is messed up. First off the 2.7 > > branch is set up to merge from the 2.8 branch. > > That part is correct. Fixes flow from trunk to the first branch to the > next > branch.... 2.7.x is much "closer" (architecturally and API's and > such) > to 2.8 than trunk so the flow of fixes is easier to go that way. > Ah OK, kinda makes sense. Just you can see how that would not be intuitive. > > > > Next, it says all revs from > > 1-1146127 are merged in - which isn't the case for sure. I've merged this > > fix manually for you... not sure the best way to fix this up... > > I noticed this when I was working on merging stuff for 2.7.3. I think > "svnmerge.py init" messed something up when trying to figure out what > version > the branch came from. I'm also not sure how to best fix it. :-( We > could > figure out the revision of the 2.7.0 release, re-initialize the > svnmerge:integrated stuff based on that, and then walk through the hundreds > of > commits to double check. Not ideal and would take some time. > Yeah, noone wants to volunteer for that :) > > > For the most part, you can "svnmerge.py rollback -M -r 1124595" to mark it > as > not integrated and then rerun the "svnmerge.py merge". > That sounds better that manually merging. Will do that next time. > > Dan > > > > > > On Thu, Sep 22, 2011 at 9:29 AM, Claus Ibsen <claus.ib...@gmail.com> > wrote: > > > Hi > > > > > > I am in need to backport CAMEL-3962 to the Camel 2.7 branch. > > > > > > The commit has svn rev: 1124595 > > > > > > But when I check the svnmerge.py avail list, then that commit number > > > is not in that range. > > > > > > > > > davsclaus:(svn)camel-2.7[camel-2.7.x:1174069]/$ svn info > > > Path: . > > > URL: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x > > > Repository Root: https://svn.apache.org/repos/asf > > > > > > So when I run > > > svnmerge.py merge -r 1124595 > > > > > > It cannot merge that fix to the 2.7 branch. > > > > > > I know some of you guys are svnmerge.py experts, and maybe can check it > > > out. > > > > > > > > > -- > > > Claus Ibsen > > > ----------------- > > > FuseSource > > > Email: cib...@fusesource.com > > > Web: http://fusesource.com > > > Twitter: davsclaus, fusenews > > > Blog: http://davsclaus.blogspot.com/ > > > Author of Camel in Action: http://www.manning.com/ibsen/ > -- > Daniel Kulp > dk...@apache.org > http://dankulp.com/blog > Talend - http://www.talend.com > -- Cheers, Jon --------------- FuseSource Email: j...@fusesource.com Web: fusesource.com Twitter: jon_anstey Blog: http://janstey.blogspot.com Author of Camel in Action: http://manning.com/ibsen
