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

Merge help!!

From: Oxley, David <David.Oxley_at_workplace-systems.plc.uk>
Date: 2003-02-04 17:55:06 CET

Our developers are getting an error with 0.17.1 that I cannot explain. This
used to work fine on our old version of 0.16.1. Is this a known problem (How
do I fix it). And once I've had this problem, how do I fix my working copy?

 

C:\dev>svn st -u -q

M 644
Staffplanner/trunk/StaffplannerHTTP/com/staffplanner/http/MaintenancePageCon
trol.java

       * 644
Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/employees/NINu
mberField.java

       * 644
Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/employees/Name
Field.java

       * 644
Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/employees/Swip
eIdField.java

M * 644
Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/fields/DayNumb
erField.java

M * 644
Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/fields/Duratio
nField.java

M 644
Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/fields/FieldOb
ject.java

M 644
Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/fields/FieldRe
quest.java

       * 644
Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/fields/Generic
TimeField.java

       * 644
Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/payments/DinfR
ecordTableHandler.java

       * 644
Staffplanner/trunk/StaffplannerKernel/metadata/DinfRecordMetaData.xml

       * 644
Staffplanner/trunk/StaffplannerKernel/metadata/EmployeeMetaData.xml

       * 644
Staffplanner/trunk/StaffplannerKernel/metadata/FixedCashPaymentMetaData.xml

       * 644
Staffplanner/trunk/StaffplannerKernel/metadata/HolidayPaymentMetaData.xml

       * 644
Staffplanner/trunk/StaffplannerKernel/metadata/HoursPaymentMetaData.xml

       * 644
Staffplanner/trunk/StaffplannerKernel/metadata/PaymentsAuditMetaData.xml

       * 644
Staffplanner/trunk/StaffplannerKernel/metadata/PerHourCashPaymentMetaData.xm
l

       * 644
Staffplanner/trunk/StaffplannerKernel/metadata/SnafRecordMetaData.xml

       * 644
Staffplanner/trunk/StaffplannerKernel/metadata/WeeklyFixedCashPaymentMetaDat
a.xml

       * 644
Staffplanner/trunk/StaffplannerKernel/metadata/WeeklyHoursPaymentMetaData.xm
l

       * 644
Staffplanner/trunk/StaffplannerKernel/metadata/WeeklyPerHourCashPaymentMetaD
ata.xml

       * 644
Staffplanner/trunk/StaffplannerPageLogic/pagelogic/EmployeeAddPage.xml

       * 644
Staffplanner/trunk/StaffplannerPageLogic/pagelogic/EmployeeMaintenancePage.x
ml

M 644
Staffplanner/trunk/StaffplannerUtils/com/staffplanner/utils/ValidationExcept
ion.java

Head revision: 645

 

c:\dev>svn up

U
Staffplanner/trunk/StaffplannerKernel/metadata/WeeklyHoursPaymentMetaData.xm
l

U Staffplanner/trunk/StaffplannerKernel/metadata/EmployeeMetaData.xml

U Staffplanner/trunk/StaffplannerKernel/metadata/DinfRecordMetaData.xml

U Staffplanner/trunk/StaffplannerKernel/metadata/SnafRecordMetaData.xml

U Staffplanner/trunk/StaffplannerKernel/metadata/PaymentsAuditMetaData.xml

U Staffplanner/trunk/StaffplannerKernel/metadata/HolidayPaymentMetaData.xml

U
Staffplanner/trunk/StaffplannerKernel/metadata/PerHourCashPaymentMetaData.xm
l

U Staffplanner/trunk/StaffplannerKernel/metadata/HoursPaymentMetaData.xml

U
Staffplanner/trunk/StaffplannerKernel/metadata/WeeklyPerHourCashPaymentMetaD
ata.xml

U
Staffplanner/trunk/StaffplannerKernel/metadata/WeeklyFixedCashPaymentMetaDat
a.xml

U
Staffplanner/trunk/StaffplannerKernel/metadata/FixedCashPaymentMetaData.xml

U
Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/fields/Generic
TimeField.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/Duratio
nField.java.tmp

Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/fields/Duratio
nField.java.tmp.tmp

Staffplanner/trunk/StaffplannerKernel/com/staffplanner/kernel/fields/Duratio
nField.java.tmp.2.tmp

 

Dave Oxley
Development Team Leader

Workplace Systems Plc
* +44 (0)118 9515 755
* <mailto:david.oxley@workplace-systems.plc.uk>
david.oxley@workplace-systems.plc.uk
* <http://www.workplace-systems.plc.uk/>
http://www.workplace-systems.plc.uk

 

There was once a young man who, in his youth, professed his desire to become
a great writer.
When asked to define great, he said, "I want to write stuff that the whole
world will read, stuff that people will react to on a truly emotional level,
stuff that will make them scream, cry, howl in pain and anger!"
He now works for Microsoft writing error messages.

 

Workplace Systems plc, Precedent Drive, Rooksley, Milton Keynes, MK13 8PP.
Registered in England No. 2016236

Unless expressly stated the views expressed in this email may not be the
views of Workplace Systems plc and the company, its directors, officers or
employees accept no liability for its contents. Unless expressly stated no
contracts may be concluded on behalf of Workplace Systems plc by means of
e-mail communication.

This e-mail, and any attachments are strictly confidential and intended for
the addressee(s) only. If they have come to you in error you must take no
action based on the contents, nor may you copy or show them to anyone.
Please notify the sender of the error by return email. Please ensure you
have adequate virus protection before you open or detach any documents from
this transmission. Workplace Systems plc does not accept any liability for
viruses.

 

________________________________________________________________________
This e-mail has been scanned for all viruses by Star Internet. The
service is powered by MessageLabs. For more information on a proactive
anti-virus service working around the clock, around the globe, visit:
http://www.star.net.uk
________________________________________________________________________
Received on Tue Feb 4 18:17:13 2003

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