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

[Fergus Henderson]

On 05-May-2003, Peter Ross <pro at missioncriticalit.com> wrote:
> Is it sufficient to issue the following commands to upgrade to the
> latest version?
> 
>         zcat gc6.2alpha4.tar.gz | tar -xvf -
>         cd gc6.2alpha4
>         cvs import -I \! mercury/boehm_gc gc gc_6_2alpha4

No.

Firstly, that only imports the new version onto the vendor branch
(well, sort of -- but see below).  To include it in the main branch,
you then have to merge the changes on the vendor branch back onto the
main branch.

Secondly, CVS has a design bug which means that actually the initial
import will affect the default branch, for *some* files.  So unless you
take special action (e.g. using "cvs admin -b" to reset the default branch
for the affected files), the main branch will be in an inconsistent state
until the vendor branch changes have been merged onto the main branch.
In other words, doing just the command above will probably stop the
nightly builds working.

See the thread at
http://mail.gnu.org/archive/html/info-cvs/2001-05/msg00088.html for
details.

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