Hi, Vadim Lebedev wrote: >> 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 >> > Jerome reverted my commits, so unless i misundestand something > if i do svn update it will apply 'reverts' to my working dir.... > Am i wrong?
Ah, right... So you will need to get your patches with svn diff -r REV1:REV2 repos and applying them with patch -p0 < patchfile >>> 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. >> >> > Can you be more explicit on this... I figured that i have to use svk for > this... > Is it possible to do with svn only? It's similar to what you do with svk. But I was thinking of just using a vendor branch like in CVS: http://svnbook.red-bean.com/en/1.1/ch07s05.html The idea is that you update the vendor branch regularly, but you lose the granularity of individual revisions, and you merge from the vendor branch back into your branch after a release, or after a certain milestone. 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
