[Soc-2008-dev] Google SoC Students/Mentors

[Jean-Luc Peurière]

Le 22 avr. 08 à 16:38, Davide Vercelli a écrit :

> On Tue, Apr 22, 2008 at 2:59 AM, Martin Poirier <theeth at yahoo.com>  
> wrote:
>>  Checking out a branch is the same as trunk, just enter the url to  
>> your branch and you're all set
>
> Oh yes, thanks, what I meant is that I've no experience with branch
> syncing and that kind of stuff, but, again, I don't think that's going
> to be a problem. I just have to re-read this:
>
> http://svnbook.red-bean.com/en/1.4/svn.branchmerge.copychanges.html

A word of warning.

It is very much better to merge on a regular schedule like every week  
or so.
If not, files changed in both trees will soon be an headache to sync.

be sure to keep track of the last revision merged. svn can happilly  
apply
things twice and give you a mess


Jean-Luc Peurière
jlp at nerim.net



-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.blender.org/pipermail/soc-2008-dev/attachments/20080422/65b25ce4/attachment.htm