[m-rev.] diff: enable par grades on MacOS X

[Fergus Henderson]

On 05-May-2003, Peter Ross <pro at missioncriticalit.com> wrote:
> Oh dear,

Oh dear oh dear :-(

> I am not sure what has happened now, but this is the order of
> the commands that I have executed.
> 
> # zcat gc6.2alpha4.tar.gz | tar -xvf -
> # cd gc6.2alpha4
> # cvs import -I \! mercury/boehm_gc gc gc_6_2alpha4

OK....

> # cd mercury/boehm_gc

Huh?  Didn't that result in "No such directory"?
How did you get a "mercury/boehm_gc" subdirectory inside the
gc6.2alpha4 directory that you just cd'd to above?

Or did you mean "cd $MYWORKSPACE/mercury/boehm_gc"?

When I wrote "(e.g. using "cvs admin -b" to reset the default branch
for the affected files)", I probably should have mentioned that this
will only work in some cases, and that in other cases something else
is required.

I suggest that you first worry about fixing the inconsistent state of
the repository, and then deal with the merge.

The affected files are the ones marked with "U" below:

	cvs update: Updating .
	U BCC_MAKEFILE
	U mallocx.c
	U win32_threads.c
	cvs update: Updating Mac_files
	cvs update: Updating cord
	cvs update: Updating cord/private
	cvs update: Updating doc
	U doc/Makefile.am
	U doc/Makefile.in
	U doc/gcinterface.html
	U doc/leak.html
	U doc/scale.html
	cvs update: Updating include
	U include/Makefile.am
	U include/Makefile.in
	U include/gc_config_macros.h
	U include/gc_cpp.h
	cvs update: Updating include/private
	cvs update: Updating tests

My guess is that the best way to fix it is to commit yesterday's
copies of these files on the main branch.  But I could be wrong.

-- 
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
--------------------------------------------------------------------------