questions on development(7)

[Eric Anderson]

On Nov 8, 2007, at 11:36 PM, Aryeh M. Friedman wrote:

>
>>>
>>> 2. If yes to #1 how do I setup keeping everything except my modified
>>> code in sync (and if possible to retro activally apply patchs from  
>>> the
>>> local branch unto the main source tree [/usr/src2])
>>
>> You won't be able to commit to the BSD repo from your server.  I
>> think you should treat your repo as read only and use cvsup to keep
>> it up to date.  At least that's what I do.
>
> What I meant was how do I keep from clobbering my local changes?


If you keep a local repo, and checkout from the local repo, then your  
checkout will merge the changes (unless there are conflicts).


Eric