[m-dev.] trivial diff: tools/test_mercury: fix problem with dl.m

[Fergus Henderson]

Estimated hours taken: 0.25

tools/test_mercury:
	Remove `extras/dynamic_linking/dl.m' before doing `cvs checkout',
	to avoid cvs conflicts when switching between the main branch and
	the release branch.

Index: test_mercury
===================================================================
RCS file: /home/staff/zs/imp/mercury/tools/test_mercury,v
retrieving revision 1.131
diff -u -d -u -r1.131 test_mercury
--- test_mercury	2001/01/24 23:14:04	1.131
+++ test_mercury	2001/01/26 15:51:21
@@ -313,6 +313,10 @@
 
 : checkout the sources
 cd $DIR || { false; exit 1; }
+# we need to manually remove this copy of dl.m to avoid spurious cvs
+# conflicts when switching between the release branch (where it is in cvs)
+# and the main branch (where it is generated automatically).
+rm -f mercury/extras/dynamic_linking/dl.m
 cvs checkout $CHECKOUT_OPTS mercury tests || { false; exit 1; }
 case $HOST in
 	murlibobo|kryten|taifun|quicksilver|hg|hydra|roy)

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
                                    |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------