[m-dev.] opium-m and 0.9

[Fergus Henderson]

On 20-Dec-1999, Erwan Jahier <Erwan.Jahier at irisa.fr> wrote:
> Replace all occurrences of Opium-M by Morphine in The Mercury files.
> 
> configure.in:
> trace/mercury_trace_external.c:
> 	Replace Opium-M	by Morphine.

That looks good, Erwan.
Could you please commit this change, on both the main branch
and the version-0_9_x branch?

The simplest way of doing that is probably as follows:

	# first commit it on the version-0_9_x branch
	cvs commit -rversion-0_9_x

	# then merge the change onto the main branch
	cvs update -A -jversion-0_9_x:yesterday -jversion-0_9_x \
		configure.in trace/mercury_trace_external.c
	cvs diff	# check that you've merged them properly
	cvs commit

Note that when doing the command to merge the changes into the
main branch, it is important to name all the files explicitly.
Otherwise cvs tries to resurrect files that were long ago deleted.

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- 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
--------------------------------------------------------------------------