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 109, Fri May 29 02:12:55 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
# Line 16  Line 17 
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 '          # import this distribution into the CVS vendor branch
21            cvs -qd ~cvs import -ko -m '110.6' flint SMLNJ v110_6 | grep -v '^U '
22    
23            # check out a new copy, trying to merge the changes into the trunk
24            cd ..; cvs co -ko -P -jSMLNJ:yesterday -jSMLNJ flint; cd flint
25            # list the conflicts
26            find -type f | xargs grep '^>>>>'
27            <... solve the problems if any ...>
28            # check files that have been removed
29            changes=$(cvs -q diff -N -r v110_5_1 -r v110_6 | sed -n -e 's/^Index: //p')
30            cd ../110.6; for f in $changes; do if [ ! -f "$f" ]; then echo $f; fi; done
31            cd ../flint; cvs rm <..some or all of the above..>
32            # check correctness
33            link ../bin.x86-unix; config/install.sh
34            cd src/compiler; link ../../../bin.x86-unix; ./xrecompile; ./xrecompile
35    
36            cd ../..; cvs commit -m 'merged in 110.6 changes'
37    
38  * /softs install  * /softs install
39  ** original  ** original

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

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