Re: [Jsynthlib-devel] fixed build error in trunk

[Vladimir A. <vl...@gm...>]

On 09/01/2011 12:01 PM, Joe Emenaker wrote:
> On 9/1/2011 7:49 AM, Vladimir Avdonin wrote:
>> Regarding you experimental work:
>>
>> The mechanism for such activity provided by subversion is branch. Once you created you branch you can screw it around in any way you please, it would not affect main line of development and releases. Once your branch would arrive to some agreeable good state, it can be merged back into trunk for common use.
>
> The only problem with that is that, back when I started it, Sourceforge wasn't using SVN, it was using CVS. SVN understands files getting *moved* to other folders, while CVS treats them as though you deleted the old file and created a new one in the new location. So, the revision history gets "broken", in a way.
>
> I'm now worried that, if I try to make a branch, SVN won't understand any continuity from the existing source tree, and it will consider the entire source code to be new.... which would make for an interesting merge into the trunk, later.
>
> But I know almost nothing about how SVN does it's thing...
>
> - Joe

Subversion is much better at that than cvs. You can keep updating your branch with changes from trunk - or any other branch for that matter. And eventually goal of any branch is to be merged back to trunk, which also works well. So continuity is not lost in either direction.

Take a look at these chapter from svn book -- it is not very long reading.

http://svnbook.red-bean.com/en/1.0/ch04.html

Regards,
Vladimir