libsvn_diff functions inputs

[Abraham Nelson <ab...@yahoo.com>]

I'm using libsvn_diff as part of a project to
implement a 3 way merge and I've successfully been
able to get the result of a 3-files merge and put it
into a string.

However I'd like to also be able to take inputs from
existing strings (or even memory blocks), but
functions such as svn_diff_file_diff3 only take file
paths for input. Is there a way to specific
variables/memory as input?



 


		
__________________________________ 
Do you Yahoo!? 
Yahoo! Mail - 250MB free storage. Do more. Manage less. 
http://info.mail.yahoo.com/mail_250

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: libsvn_diff functions inputs

[Ben Collins-Sussman <su...@collab.net>]

On Mar 30, 2005, at 7:39 PM, Abraham Nelson wrote:

> I'm using libsvn_diff as part of a project to
> implement a 3 way merge and I've successfully been
> able to get the result of a 3-files merge and put it
> into a string.
>
> However I'd like to also be able to take inputs from
> existing strings (or even memory blocks), but
> functions such as svn_diff_file_diff3 only take file
> paths for input. Is there a way to specific
> variables/memory as input?
>
>

Take a look at the full svn_diff.h API.  My memory tells me that its 
algorithms can operate on any sort of tokens at all, not just 'line' 
tokens.   svn_diff_file_diff3() is just a convenience function that 
happens to use line tokens, and happens to read the lines from files.  
There should be lower-level APIs in there for you to use.


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org