Hello, I missed the meeting, but I'd like to bring up that the SVN server doesn't support automatic sync merges or reintegrate merges. Both are very useful tools introduced in SVN 1.5 (the server is running 1.6). The reason we cannot currently use these tools is because the repository is using FSFS version 2 when it needs to be using version 3 to support these merge tools. Ways to upgrade the repository's FSFS version are discussed here[0]. While the accepted answer (using svnadmin dump) might be the better one, I think simply doing an svnadmin upgrade would be easier and still get the job done. If someone could look into this, I would really appreciate it as it would make maintaining branches a lot easier.
Thanks, Mitchell Stokes [0] http://serverfault.com/questions/208164/how-to-upgrade-v2-to-v3-fsfs-subversion-filesystem On Sun, Jul 14, 2013 at 11:05 AM, IRIE Shinsuke <[email protected]>wrote: > Hi, > > > - Good news! Pixar will release OpenSubdiv in GPL-compatible license! > > http://graphics.pixar.com/opensubdiv/release_info.html > > Apache 2.0 license is compatible with GPLv3 but incompatible with v2. > Indeed Blender source tree includes GPLv3+ files (in intern/smoke) so > I believe Blender has already moved to GPLv3. > > However, doc/license/GPL-license.txt and release/text/GPL-license.txt > files are still v2's ones. Have we forgotten to update these license > files? > > IRIE Shinsuke > > 13/07/14, Ton Roosendaal wrote: > > Hi all, > > > > Here's a summary of today's meeting in irc.freenode.net #blendercoders. > > > > 1) Blender 2.68 release status > > > > - Bug tracker still at 115 open reports. No showstopper reports (things > that used to work in previous release(s)). > > > > - Sergey Sharybin likes a bit of time to fix 2 reports. > > > > - Ton Roosendaal checks add-node error for HiDPI screens, Lukas Toenne > is around to assist. > > > > - Proposal: wednesday release-ahoy, thursday release! Also means the > logs would get ready then. > > > > - Splash - reminder to Bassam Kurdali to contact Ton! > > > > 2) Other projects > > > > - Ton proposes: when he's back from Siggraph, during august, he'll try > to set up a UI project for defaults and required changes/improvements for > 2.7x > > > > - Good news! Pixar will release OpenSubdiv in GPL-compatible license! > > http://graphics.pixar.com/opensubdiv/release_info.html > > > > 3) GSoC > > > > - Sergey has first threaded Object update work. On his 4 core system > speedup was between factor 2-3. Tested with robot attack scene from ToS and > a bunch of BBB chinchillas. > > > > - Ton has been sending out warnings to students - it's very important to > communicate well about progress, especially with good docs and daily well > logged commits. > > > > - Midterm evaluation starts in two weeks. Students should make sure > their planning and deliverables matches what was agreed on. Check for more > info on the list here: > > http://lists.blender.org/mailman/listinfo/soc-2013-dev > > > > Thanks, > > > > -Ton- > > > > -------------------------------------------------------- > > Ton Roosendaal - [email protected] - www.blender.org > > Chairman Blender Foundation - Producer Blender Institute > > Entrepotdok 57A - 1018AD Amsterdam - The Netherlands > > > > > > > > _______________________________________________ > > Bf-committers mailing list > > [email protected] > > http://lists.blender.org/mailman/listinfo/bf-committers > > > _______________________________________________ > Bf-committers mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-committers > _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
