Diff of /sml/trunk/CVSNOTES

Parent Directory | Revision Log | Patch

	revision 114, Fri Jun 5 19:41:21 1998 UTC	revision 115, Fri Jun 5 19:43:05 1998 UTC
#	Line 11	Line 11
11	mkdir 110.6; cd 110.6	mkdir 110.6; cd 110.6
12	scp daffy:~ftp/pub/smlnj/working/110.6/\*.gz .	scp daffy:~ftp/pub/smlnj/working/110.6/\*.gz .
13	mkdir src; cd src	mkdir src; cd src
14	ztar ../110.6-*.gz	ztar ../*.gz
15	mv bin.* ../../	mv bin.* ../../
16	mv config ../	mv config ../
17	cd ..	cd ..
18	mv *-bin.* ../	mv *-bin.* ../
19	rm *.gz	rm *.gz
20
21	# import this distribution into the CVS vendor branch	# import this distribution into the CVS vendor branch
22	cvs -qd ~cvs import -ko -m '110.6' flint SMLNJ v110_6 | grep -v '^U '	cvs -qd ~cvs import -ko -m '110.6' flint SMLNJ v110_6 | grep -v '^U '
23
24		# find the files that got deleted and `cvs rm' them
25		cd ..; cvs -d ~cvs co -d smlnj -r SMLNJ flint; cd smlnj
26		cvs rm $(cvs -q diff -s -r v110_6 | sed -n -e 's/^Index: //p')
27		cvs commit -m 'removed deleted files'
28		cvs tag v110_6
29
30	# check out a new copy, trying to merge the changes into the trunk	# check out a new copy, trying to merge the changes into the trunk
31	cd ..; cvs co -ko -P -jSMLNJ:yesterday -jSMLNJ flint; cd flint	cd ..; cvs co -ko -P -jSMLNJ:yesterday -jSMLNJ flint; cd flint
32	# list the conflicts	# list the conflicts

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.114   changed lines   Added in v.115

---

root@smlnj-gforge.cs.uchicago.edu	ViewVC Help
Powered by ViewVC 1.0.0