[m-rev.] For review: State Variables

[Fergus Henderson]

On 06-Jun-2002, Ralph Becket <rafe at cs.mu.OZ.AU> wrote:
> Fergus Henderson, Thursday,  6 June 2002:
> > 
> > It looks like you have not properly merged in Pete's foreign_type
> > changes here.
> 
> Simon got there first.  The problem was that I did a CVS udpate, then
> decided against it at the time and copied the .#make_hlds.m back-up
> file back over make_hlds.m, hence CVS is convinced my make_hlds.m is 
> more up-to-date than it is.
> 
> Any suggestions on the best way to proceed?  IANACVSS (*)

Move your current make_hlds.m to make_hlds.m.tmp,
then do `cvs update -r <revision-number> make_hlds.m',
then do `mv make_hlds.m.tmp make_hlds.m'.
This will convince CVS that your make_hlds.m is changed
with respect to the specified <revision-number>.

You then NEED to remember to use `cvs update -A'
instead of `cvs update' when you want to update to
the latest version.

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------