[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: Brandon Ehle <azverkan_at_yahoo.com>
Date: 2003-02-04 21:37:50 CET

>
>
> 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.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Feb 4 18:30:25 2003

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