[cvsnt] Committing unmodified file after merge

[Harrison, Andrew]

> From: Tony Hoyle [mailto:tmh at nodomain.org]
>
> The extra revision is to record the mergepoint.  It's perfectly 
> harmless, and only takes a few bytes in the RCS file.

Ok, but why do you need the mergepoint if the file hasn't changed? In my
previous example revision 1.3.2.1 would have mergepoint 1.4 in it, and that
should be sufficient for any future merges between Main and Dev2 shouldn't
it? Sorry if that's a daft question, but I'm not 100% sure how the
mergepoint stuff works yet. The whole reason we're using CVS is cos we're
running two parallel developments at the moment and I persuaded my PM that
CVS would be better for this than VSS which we've used previously.

Regards,

Andy Harrison

Platform Software Engineer 
Anite Telecoms Ltd.
127 Fleet Road, 
Fleet, Hampshire, GU51 3QN, UK 
http://www.anite.com/telecoms

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.