On Wed, Oct 14, 2009 at 11:49 AM, Isuru Suriarachchi <is...@wso2.com> wrote:
> > > On Wed, Oct 14, 2009 at 11:42 AM, Samisa Abeysinghe <sam...@wso2.com>wrote: > >> >> >> On Wed, Oct 14, 2009 at 11:26 AM, Isuru Suriarachchi <is...@wso2.com>wrote: >> >>> Hi all, >>> >>> As our existing 2.0.2 branch has missed many commits which went into >>> 2.0.1 branch, we have to re-create the 2.0.2 branch from the 2.0.1 branch. >>> So we have to delete the existing 2.0.2 branch. >>> >>> Milinda, Waruna, Kalpanie, Anjana and DimuthuL have committed into 2.0.2 >>> branch and there are 54 commits which have gone into 2.0.2. So can you >>> backup your commits now and put them back once the new 2.0.2 branch is >>> created? I'm going to create the new brach in the afternoon. If you have any >>> concerns, please reaise as soon as possible. >>> >>> Or we can move this existing branch to a temp location and create the new >>> branch. WDYT??.. >>> >> >> Would, by any chance, merging work? >> May be we should make a copy of the current 2.0.2 first and then try a >> merge. If that does not work, then make a fresh copy out of 2.0.1 and then >> do manual merging. >> > > Merging the entire branch won't work I think. But may be we can merge the > changed components only. I'll try that. > I tried to merge the changed components and it didn't work properly. And also I tried using svn diffs between revisions with no luck. I think we have to manually do the commits again :( . Thanks, ~Isuru > > Thanks, > ~Isuru > > >> >> Samisa... >> >> >>> >>> Thanks, >>> ~Isuru >>> >>> _______________________________________________ >>> Carbon-dev mailing list >>> Carbon-dev@wso2.org >>> https://mail.wso2.org/cgi-bin/mailman/listinfo/carbon-dev >>> >>> >> >> >> -- >> Samisa Abeysinghe >> Director, Engineering - WSO2 Inc. >> >> http://www.wso2.com/ - "The Open Source SOA Company" >> >> _______________________________________________ >> Carbon-dev mailing list >> Carbon-dev@wso2.org >> https://mail.wso2.org/cgi-bin/mailman/listinfo/carbon-dev >> >> >
_______________________________________________ Carbon-dev mailing list Carbon-dev@wso2.org https://mail.wso2.org/cgi-bin/mailman/listinfo/carbon-dev
