Re: svn external diff with non-local file fails? [SOLVED]

[Jesse Barnum <wo...@360works.com>]

Marshall, it looks like you're right about this. I changed my shell 
script to copy the temp file to another file, instead of trying to open 
it, and my shell script works now by opening this other temp file. 
Thanks for your help!

--Jesse

On Mar 25, 2005, at 6:13 PM, Marshall White wrote:

> On Friday 25 March 2005 12:20 am, Jesse Barnum wrote:
>> Thanks for your fast response!
>>
>> I am just taking the arguments provided by subversion... when I wrote
>> that the file I was trying to open is
>> '.svn/tmp/text-base/AdReqDetail.java.svn-base', that is coming from
>> subversion - I didn't specifically go into that directory. The problem
>> is that this file1 argument being passed to my shell script is
>> referencing a non-existent file - when I try to pass it along to
>> FileMerge, I get an error that it could not be read, and when I look 
>> in
>> that directory after running the diff command, the directory is empty.
>>
>> Here is the complete list of arguments being passed to my script:
>>
>> jesse% svn diff --diff-cmd /Users/jesse/.subversion/svndiff -r78
>> AdReqDetail.java
>> Index: AdReqDetail.java
>> ===================================================================
>> ---Opening FileMerge---
>> -u -L AdReqDetail.java (revision 78) -L AdReqDetail.java (working 
>> copy)
>> .svn/tmp/text-base/AdReqDetail.java.svn-base AdReqDetail.java
>>
>> --Jesse
>>
>
>
> Subversion will delete the temporary files when your script exits.  
> So, if
> your script doesn't wait on FileMerge to exit before it does, the 
> files can
> disappear before FileMerge gets a chance to open them.
>
> Marshall


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

Re: svn external diff with non-local file fails? [SOLVED]

[Ryan Schmidt <su...@ryandesign.com>]

On 26.03.2005, at 14:17, Jesse Barnum wrote:

> On Mar 25, 2005, at 6:13 PM, Marshall White wrote:
>
>> Subversion will delete the temporary files when your script exits.  
>> So, if
>> your script doesn't wait on FileMerge to exit before it does, the 
>> files can
>> disappear before FileMerge gets a chance to open them.
>
> Marshall, it looks like you're right about this. I changed my shell 
> script to copy the temp file to another file, instead of trying to 
> open it, and my shell script works now by opening this other temp 
> file. Thanks for your help!

See also the files svndiff.sh and svnfilemerge.sh (attached) from the 
svnX program which also does it this way.

It would seem to be the better solution to pass a switch to opendiff to 
tell it to wait for FileMerge to exit before returning, but there does 
not appear to be any such switch -- at least not that I can see from 
its brief usage message.