[SciPy-dev] Proposal: scipy.spatial

[Jonathan Guyer]

On Oct 1, 2008, at 5:42 AM, David Cournapeau wrote:

> As Robert said, the problem of svn with merging is unlikely to  
> happen in
> your case (Problems arise mostly when you use multiple branches and
> merge between them; as long as you have one branch which keeps  
> following
> the trunk,

We keep things simple. We release from the trunk and strive to do all  
development on branches from the trunk. I don't believe we've ever  
branched a branch and I don't think we'd ever want to. The keys to  
keeping things manageable for us are (1) disciplined commenting and  
(2) merging *from* the trunk to the branches on a pathologically  
regular basis. If you don't do the latter, then when you do try to  
merge your branch to the trunk, you can have an insurmountable amount  
of work facing you.

> svn poor merging capabilities can be worked around with
> svnmerge).

Thanks for the pointer to svnmerge. Although I'd read about it early  
on, I'd forgotten about it. I definitely see its value in keeping the  
history intact.