[SciPy-dev] The future of SciPy and its development infrastructure

[Stéfan van der Walt]

2009/2/23 Robert Kern <robert.kern at gmail.com>:
> On Mon, Feb 23, 2009 at 15:24, Stéfan van der Walt <stefan at sun.ac.za> wrote:
>> Hi Robert
>>
>> 2009/2/23 Robert Kern <robert.kern at gmail.com>:
>>> On Mon, Feb 23, 2009 at 15:06, Charles R Harris
>>> <charlesr.harris at gmail.com> wrote:
>>>
>>>> I think git-svn takes care of most of the branching problem on a local
>>>> basis. Where it fall down, IMHO, is in testing a branch on the builtbots and
>>>> sharing a branch among two or three people.
>>>
>>> Why is that? Push your git branch to github.
>>
>> What do you say to the merging difficulties that SVN causes?  Git-svn
>> doesn't address that, unfortunately.
>
> Scenario? There are several merging difficulties of SVN, and I do
> believe that git-svn addresses at least some of them. Precisely what
> are you thinking of?

I was thinking of this, from
http://www.kernel.org/pub/software/scm/git/docs/git-svn.html

"""
Running git-merge or git-pull is NOT recommended on a branch you plan
to dcommit from. Subversion does not represent merges in any
reasonable or useful fashion; so users using Subversion cannot see any
merges you've made. Furthermore, if you merge or pull from a git
branch that is a mirror of an SVN branch, dcommit may commit to the
wrong branch.
"""

Cheers
Stéfan