[Bf-committers] unresolved subversion conflict in file blender/scons/scons-local-1.1.0/SCons/Tool/cc.py

[Dietrich Bollmann]

Uppsa...

...sorry sorry :)

...I found it grepping for '<<<<<<<' in order to search for conflicts in
my own sources and for some reason didn't notice that it is
uncommented...

Thank you for your response and sorry for writing this superfluous
mail :)

Cheers, Dietrich


By the way - misusing this message for some half private information: 

As far as I remember you have been the person indicating me to the
launchpad blender branch, and, beside me, the only person subscribing to
it.  Have you noticed that there is a new import of the blender
repository?

Here it is: https://code.edge.launchpad.net/~vcs-imports/blender/trunk
(the old one moved to:
https://code.edge.launchpad.net/~vcs-imports/blender/bf-blender-old ).

I played around with it a bit and it really makes it much much easier to
work on the blender sources for people who do not have writing access to
the blender repository or are working on some private version /
customisation of blender which is not interesting for the standard
blender user and therefore not accepted to the trunk.

Before I used my own private subversion repository importing the blender
sources as a "vendor drop" (see paragraph "Vendor Branches" in chapter
4. "Branching and Merging" of the "Version Control with Subversion"
book,
http://svnbook.red-bean.com/nightly/en/svn.advanced.vendorbr.html ) -
which was much better than no version control at all but made updates
complicated and time consuming.  Using launchpad makes these thing
finally easy :)

May be this could be a solution for other people also who asked for a
different version control system!

On Thu, 2008-11-13 at 15:41 +0200, Nathan Letwory wrote:
> That's not really an unresolved conflict, since it has been commented
> out. If it were one, it would start at the beginning of the respective
> lines.
> 
> /Nathan
> 
> On Thu, Nov 13, 2008 at 1:22 PM, Dietrich Bollmann <diresu at web.de> wrote:
> > Hi,
> >
> > I found an unresolved svn conflict in the blender repository:
> >
> > #<<<<<<< .working
> > #
> > #    env['_CCCOMCOM'] = '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS'
> > #    # It's a hack to test for darwin here, but the alternative of creating
> > #    # an applecc.py to contain this seems overkill.  Maybe someday the Apple
> > #    # platform will require more setup and this logic will be moved.
> > #    env['FRAMEWORKS'] = SCons.Util.CLVar('')
> > #    env['FRAMEWORKPATH'] = SCons.Util.CLVar('')
> > #    if env['PLATFORM'] == 'darwin':
> > #        env['_CCCOMCOM'] = env['_CCCOMCOM'] + ' $_FRAMEWORKPATH'
> > #=======
> > #>>>>>>> .merge-right.r1907
> >
> > See file blender/scons/scons-local-1.1.0/SCons/Tool/cc.py
> > or online: https://svn.blender.org/svnroot/bf-blender/trunk/blender/scons/scons-local-1.1.0/SCons/Tool/cc.py
> >
> > Cheers,
> > Dietrich
> >
> >
> > _______________________________________________
> > Bf-committers mailing list
> > Bf-committers at blender.org
> > http://lists.blender.org/mailman/listinfo/bf-committers
> >
> >