[Bf-cycles] Problems about source version control when I add code to Cycles.

[Brecht Van Lommel]

Subversion doesn't really support such a setup well, I wouldn't
recommend it. Easiest would be to clone this git repository, which is
kept in sync with svn automatically. Then you can do typical git
stuff, locally creating branches and committing.

git clone git://gitorious.org/blenderprojects/blender.git blender #
initial checkout
git pull origin # svn update

Personally I use git svn, which is a bit more complicated, the only
reason for that is because it allows me to also commit to svn.
http://wiki.blender.org/index.php/User:Brecht/Setup#Git

By the way, don't use the cycles branch, that's not in use anymore,
development is done in trunk now.

Brecht.

On Mon, Dec 26, 2011 at 5:31 AM, Yansi Yao <yaoyansi2 at yahoo.cn> wrote:
> Hi all,
> I'm going to add code to cycles,  but I encounter some problems.
> My situation is:
> 1.I'm not a developer of Cycles, so I can't commit my code to Cycles branch.
> 2.I checked out the Cycles branch source code to a directory, say it
> $(CyclesRoot), on my local machine.
> 3.If I modify the code of Cycles, I need to commit the code to my local
> repository with SVN or Git.
> 4.The source code of Cycles is updating everyday.
>
> Let me take an example, I modified the file
> device.cpp($(CyclesRoot)/intern/cycles/device/device.cpp). Then I update the
> code in $(CyclesRoot) to the latest version from Blender repository. I
> resolve the conflict on device.cpp if there is. Now the problem occurs, how
> I commit device.cpp to my local repository?
>
> Regards
> yaoyansi
>
>
>
>
> _______________________________________________
> Bf-cycles mailing list
> Bf-cycles at blender.org
> http://lists.blender.org/mailman/listinfo/bf-cycles
>