[Bf-committers] Blender 2.44a windows only

Diego B bdiego at gmail.com
Mon May 28 17:43:54 CEST 2007


I make some test with svn and it's possible make a "2.44-stable" branch and
keep it sync with trunk using the merge tools of svn.
This is what i think about it:

1) Need a "main" or "principal" maintain that check the change made in
the trunk and merge it in the stable branch (and keep a history of what merge
from the trunk to the stable branch).

2) Set a format for the commit message in the stable branch.
For example:

We make a stable branch of the revision 10766 of blender trunk.
Now suppose that we can merge the fix of the revision 10782 of trunk into
the stable branch:
     #stable-branch> svn merge -r 10781:10782 \

Now i only need commit this change:

    #stable-branch> svn commit -m "Merge From trunk revision 10781:10782"

The problem is that svn don't know from where come the change... so we need
keep a track about what changset (revision) merge from the trunk to
the stable branch.

I don't see any problem to create and keep sync the stable branch.
Ton ? Campbell ? what you think ?

On 5/28/07, Ton Roosendaal <ton at blender.org> wrote:
> Hi,
> Yesterday's meeting reveiled that two main showstoppers exist;
> - missing OS module in Python windows
> - ffmpg error blocks using "Play" (anim playback of images).
> Also because of a lot of changes in the python api already, it was
> decided it's wiser to not make a 2.44a update based on current svn, but
> only a 2-feature update for windows only. Both errors as described
> above are sort-of build errors anyway.
> Needless to say; it's also easier to communicate, and less work for
> everyone! :)
> Using svn this now seems to be pretty much simpler to do. We also could
> combine this with establishing a 2.44-stable branch, with the fixes as
> mentioned above. Campbell and Diego have volunteered to maintain this
> branch (= sync with trunk's important bugfixes).
> -Ton-
> ------------------------------------------------------------------------
> --
> Ton Roosendaal  Blender Foundation ton at blender.org
> http://www.blender.org
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers




More information about the Bf-committers mailing list