Home My Page Projects Code Snippets Project Openings SML/NJ
Summary Activity Forums Tracker Lists Tasks Docs Surveys News SCM Files

SCM Repository

[smlnj] Diff of /sml/trunk/CVSNOTES
ViewVC logotype

Diff of /sml/trunk/CVSNOTES

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 108, Thu May 28 22:07:09 1998 UTC revision 118, Fri Jun 5 21:38:17 1998 UTC
# Line 7  Line 7 
7          cvs -d ~cvs import -m '' smlnj/src/sml-nj FLINT v980311          cvs -d ~cvs import -m '' smlnj/src/sml-nj FLINT v980311
8    
9  * from tarballs  * from tarballs
10            # untar the distribution
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          cvs -qd ~cvs import -m '110.6' flint SMLNJ v110_6 | grep -v '^U '  
21            # import this distribution into the CVS vendor branch
22            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            cd ..; rm -rf smlnj
30    
31            # check out a new copy, trying to merge the changes into the trunk
32            cvs co -ko -P -jSMLNJ:yesterday -jSMLNJ flint; cd flint
33            # list the conflicts
34            find -type f | xargs grep '^>>>>'
35            <... solve the problems if any ...>
36            # check correctness
37            link ../bin.x86-unix; config/install.sh
38            cd src/compiler; link ../../../bin.x86-unix; ./xrecompile; ./xrecompile
39    
40            cd ../..; cvs commit -m 'merged in 110.6 changes'
41    
42  * /softs install  * /softs install
43  ** original  ** original

Legend:
Removed from v.108  
changed lines
  Added in v.118

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