Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
> From: Tony Hoyle [mailto:tmh at nodomain.org] > > > I now want to merge Branch1 into Branch2. There have been > no changes in > > either branch (in this file). What would you expect the > result to be? > > > Exactly what happens... absolutely nothing, since branch1 > hasn't changed > since branch2 was created. (Tony, I sent a reply this morning but it didn't get through cos it was too large - I'd copied a large WinCVS log into the mail to show what I was doing and the result. Here's a much shorter version...) Ok, at least we now agree what is supposed to happen! Sorry, maybe I wasn't explaining it very well earlier. Now we just need to find out why it's not working for me. This is what I'm doing, as you can see the Branch1->Branch2 merge creates a new version of file1.c: Current files, both at rev 1.1: C:\mergetest\file1.c C:\mergetest\file2.c Commands all issued in directory C:\mergetest\ cvs tag -b Branch1 cvs remove file1.c cvs commit -m "no message" cvs tag -b Branch2 cvs update -r Branch2 cvs update -jBranch1 cvs commit -m "no message" cvs log file1.c Rcs file : '/cvs_nt/mergetest/file1.c,v' Working file : 'file1.c' Head revision : 1.2 Branch revision : Locks : strict Access : Symbolic names : 1.2.0.2 : 'Branch2' 1.1.0.2 : 'Branch1' Keyword substitution : 'kv' Total revisions : 3 Selected revisions : 3 Description : ---------------------------- Revision : 1.2 Date : 2004/2/25 9:39:54 Author : 'aharrison' State : 'dead' Lines : +0 0 Branches : 1.2.2 Keyword : 'kv' CommitID : '230403c6d640000' Description : no message ---------------------------- Revision : 1.1 Date : 2004/2/25 9:36:46 Author : 'aharrison' State : 'Exp' Lines : +0 0 Description : no message ---------------------------- Revision : 1.2.2.1 Date : 2004/2/25 9:41:36 Author : 'aharrison' State : 'Exp' Lines : +0 0 Keyword : 'kv' CommitID : '220403c6dca0000' MergePoint : '1.1' Description : no message =============================================== Regards, Andy -- Andy Harrison - Platform Software Engineer Anite Telecoms Ltd. 127 Fleet Road, Fleet, Hampshire, GU51 3QN, UK "No matter how bad things seem... ...nothing could be worse than being used as a towel rail." - A.A. Milne Please note that my email domain has changed from @anitetelecoms.com to @anite.com Registered in England No. 1721900 Registered Office: 353 Buckingham Avenue, Slough, Berkshire SL1 4PF, United Kingdom Scanned for viruses by MessageLabs. The integrity and security of this message cannot be guaranteed. This email is intended for the named recipient only, and may contain confidential information and proprietary material. Any unauthorised use or disclosure is prohibited.