[cvsnt] Re: commit -r and admin -o

[Harrison, Andrew]

> From: Tony Hoyle [mailto:tmh at nodomain.org]
 
> >Would it be possible to add this functionality to commit -r, 
> ie if you
> >specify a revision that would be in the past, but doesn't 
> exist, then it
> >inserts it into the RCS file at the specified point?

> That would be really hard to implement - eg. you could create
> conflicts in the middle of the file.  It's well outside the remit of
> something like commit -r to do this... possibly an admin command but
> I'm not sure I'd trust the result.

I agree that it probably should be an admin command. However I don't see how
it would create conflicts?

Assume you had a revsion 1.14 and 1.16 but no 1.15. The RCS file stores the
1.14->1.16 delta as a single change. If you then add in a 1.15 CVS would
then store the 1.14->1.15 delta as a change, and the 1.15->1.16 delta would
then be stored instead of the original 1.14->1.16 delta. Even if the file
you are committing as 1.15 was completely different to the 1.14 and 1.16
already there, it wouldn't cause conflicts as the resulting 1.16 would not
change because 1.14->1.16 would be the same as 1.14->1.15->1.16.

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.