"Jay Freeman \(saurik\)" <saurik@saurik.com> writes:
> However, I have a more powerful conclusion :). The merging engine
> needs to be extensible in the be-all and end-all of concurrent
> version control. I.e., based on possibly the MIME type, there
> should be special support for doing merge operations on Visual
> Studio projects (maybe a Python script that gets sent from the
> server back to the client if the client has an old version... maybe
> a set of Parrot byte codes to be more language neutral, but
> something). This way, the lists of changes can be modeled as "a
> file was added, the box for debug information was checked, and the
> output file name was changed" rather than "here is a diff between
> two files whose content I don't understand".
>
> Subversion probably won't bother with that, but I can still dream :-).
Jay, extensible diff & merge support on the client side has been a
goal of Subversion's since Day One.
Standard `diff' and `patch' happen to be the first things readily
available, so they're the first things that work.
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:52 2006