Hi, Vadim Lebedev wrote: > BTW, i've just realized that i'm REALLY SCREWED now. > If i do svn update to my working dir i loose all my modifications.
I don't think so - in fact, you will keep your modifications up to date with the 2.1 branch - if there are any changes in the files you're changing, then they will be merged in when you update. If those changes are in the same parts of the file that you're working in, then you will get a conflict, and the unmergable areas are marked with the CVS <<<<====>>>> markers. > The only 2 ways out i see is: > 1) i'll use SVK to create the repository mirror > 2) you create the -unstable branch 3. You can create an SVN repository, with a vendor branch that you merge regularly into your working branch. > In case of SVK my bug fixes and patches will live out of your tree and > will be relative to > my tree and it will be rather difficult to integrate them later. If you are pulling the OpenWengo 2.1 branch regularly, then your patches will be kept up to date (or they will break things when they get out of sync, and you will have to update your changes). I do want to insist on the timescale we're talking about, though - we are talking about a few days here, and I will work on clearing up this issue over the next couple of weeks. This is not an issue that will drag on for months (famous last words). Cheers, Dave. -- Dave Neary OpenWengo Community Development Manager Email: [EMAIL PROTECTED] _______________________________________________ Wengophone-devel mailing list [email protected] http://dev.openwengo.com/mailman/listinfo/wengophone-devel
