[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge help!!

From: Branko Čibej <brane_at_xbc.nu>
Date: 2003-02-04 22:31:05 CET

Brandon Ehle wrote:

>>
>>
>> U
>> Staffplanner/trunk/StaffplannerKernel/metadata/FixedCashPaymentMetaData.xml
>>
>>
>> U
>> Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/fields/GenericTimeField.java
>>
>>
>> svn: Problem running log
>>
>> svn: in directory
>> Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/fields
>>
>> svn: start_handler: error processing command 'merge' in
>> Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/fields
>>
>> svn: Error calling external program
>>
>> svn: svn_io_run_diff3: Error running C:\Program
>> Files\Subversion\helpers\cygdiff\diff3.exe: exitcode was 2, args were:
>>
>> in directory ., basenames:
>>
>> Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/fields/DurationField.java.tmp
>>
>> Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/fields/DurationField.java.tmp.tmp
>>
>> Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/fields/DurationField.java.tmp.2.tmp
>>
> This either a misconfiguration of paths to diff & diff3 or your
> DurationField.java file conatins some NULL characters.

No, it's a known problem that was fixed after 0.17.1. See
http://subversion.tigris.org/project_faq.html#diff3-diff.

-- 
Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Feb 4 22:31:51 2003

This is an archived mail posted to the Subversion Dev mailing list.