>I'm not sure that will do what he wants. If you use
>svn --diff3-cmd=FancyMergeTool, that will run the merge tool when
>updating or switching to a branch or merging things instead of just when
>there's a conflict, right?
>
>It sounds like he wants a way to automatically start his merge tool with
>the correct arguments only when there's a conflict, instead of manually
>having to run the merge tool on blah.234234.mine, blah.234353.r1234 and
>blah.455325.r1346, and then remembering to save the result to blah.
>
>I suspect it would be best to have a script which trawls through the wc
>looking for conflicted files and then calls the merge tool with the
>appropriate args and calls svn resolve afterwards if appropriate.
I think the list had a brief discussion regarding a diff tool based
on file mime-type. It would be a wonderful extension, as it would
enable
* Much better diff algos for certain types of files, e.g. UML
diagrams can be packed quite heavily
* The diff3/merge stuff is completely different from a
line-by-line system in several formats. Thus, a pluggable diff
system would yield better conflict resolution.
I realise this is post-1.0, and probably a repeated request; just
thinking out loud. In fact, in the longterm I might be interested to
work on this, since we're working here quite a bit on UML modelling &
metamodelling, and version control is one aspect of that. No promises
though, and nothing now, sorry.
Oh, and I used Bitkeeper for staying in sync on linux-2.5 for a while,
before the license change became known to the general public, I'm sure
you remember. Do you think this is a problem for working now on SVN?
Regards,
Marcus
--
Marcus Alanen
maalanen@abo.fi
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 11 13:08:15 2003