David Cournapeau wrote:
> On Jan 5, 2008 4:38 PM, Robert Kern <[EMAIL PROTECTED]> wrote:

>> It's worth noting that SVN 1.5 will be tracking such information. But that
>> release is a long ways off.
>>
> My understanding, but I do not follow svn much, is that in 1.5, you
> will only get what svnmerge gives you today.

I suspect that much of the remaining fragility when using svnmerge is linked to 
the fact that it must exist outside of the core. It needs to manage its 
information through SVN properties which are themselves revision-controlled and 
occasionally need merging themselves if there are multiple branches being 
tracked. If this information were integrated into the core of SVN itself, I 
conjecture that as far as merging is concerned, SVN 1.5 will be mostly on par 
with the average DVCS.

For a brief rundown of the differences of 1.5's merge tracking and svnmerge:

   http://blogs.open.collab.net/svn/2007/10/subversion-15-m.html

-- 
Robert Kern

"I have come to believe that the whole world is an enigma, a harmless enigma
  that is made terrible by our own mad attempt to interpret it as though it had
  an underlying truth."
   -- Umberto Eco
_______________________________________________
Numpy-discussion mailing list
Numpy-discussion@scipy.org
http://projects.scipy.org/mailman/listinfo/numpy-discussion

Reply via email to