Ok, he's got me convinced/confused now. Merge really does not seem to be
behaving in a manner consistent with the documentation. The result file is
simply the contents of the branch file (1.17.4.1), there was no merge of the
file's contents into the main branch. There should have been two conflicts
(based on the diff I did) and code that was in 1.17 is not there. What's
wrong? I think we're following 5.6 from the Cederqvist exactly. We must be
doing something wrong. Please help! I've included the commands used and
the file's status before and after the merge command below.
Jeanie
Status of file before the update to the trunk.
===================================================================
File: EQC_RobotArm.java Status: Up-to-date
Working revision: 1.17.4.1 Tue Jan 29 19:19:57 2002
Repository revision: 1.17.4.1
/export/cvsroot/systema/source/JEQC/src/de/systemagmbh/eqc/EQC_RobotArm.java
,v
Sticky Tag: systema_rev (revision: 1.17.4.1)
Sticky Date: (none)
Sticky Options: (none)
Existing Tags:
systema_rev (revision: 1.17.4.1)
IDT_rev (revision: 1.17)
v1_2_again (branch: 1.17.4)
beautified_only (revision: 1.18)
systema_v1_2 (branch: 1.16.2)
Release_Jan16_2002 (revision: 1.16)
Release_Nov20_2001 (revision: 1.16)
Release_Oct26_2001 (revision: 1.15)
Release_Oct12_evening_2001 (revision: 1.15)
Release_Oct12_2001 (revision: 1.15)
Release_Oct11_2001 (revision: 1.15)
Release_Oct10_2001 (revision: 1.15)
Release_Aug21_2001 (revision: 1.10)
Release_Aug14_2001 (revision: 1.9)
SYSTEMA_FIRST_20010525 (revision: 1.1.1.1)
SYSTEMA (branch: 1.1.1)
===================================================================
cvs update -r IDT_rev
cvs update -j systema_rev EQC_RobotArm.java
===================================================================
status of file after merge:
===================================================================
File: EQC_RobotArm.java Status: Up-to-date
Working revision: 1.17 Result of merge
Repository revision: 1.17
/export/cvsroot/systema/source/JEQC/src/de/systemagmbh/eqc/EQC_RobotArm.java
,v
Sticky Tag: IDT_rev (revision: 1.17)
Sticky Date: (none)
Sticky Options: (none)
Existing Tags:
systema_rev (revision: 1.17.4.1)
IDT_rev (revision: 1.17)
v1_2_again (branch: 1.17.4)
beautified_only (revision: 1.18)
systema_v1_2 (branch: 1.16.2)
Release_Jan16_2002 (revision: 1.16)
Release_Nov20_2001 (revision: 1.16)
Release_Oct26_2001 (revision: 1.15)
Release_Oct12_evening_2001 (revision: 1.15)
Release_Oct12_2001 (revision: 1.15)
Release_Oct11_2001 (revision: 1.15)
Release_Oct10_2001 (revision: 1.15)
Release_Aug21_2001 (revision: 1.10)
Release_Aug14_2001 (revision: 1.9)
SYSTEMA_FIRST_20010525 (revision: 1.1.1.1)
SYSTEMA
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
