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 119, Fri Jun 5 22:03:51 1998 UTC revision 183, Sun Nov 8 16:58:19 1998 UTC
# Line 1  Line 1 
1  -*- outline -*-  -*- outline -*-
2    
3    * from Lal's deltas
4            cvs -d ~cvs co -d smlnj -r SMLNJ flint; cd smlnj/src
5            mkdir tmp; cd tmp
6            ncftp 'daffy:/pub/smlnj/tmp/george/110.7.1/*'
7            cd ..
8            for tarball in tmp/*.tar.gz; do gtar zxUvpf $tarball; done
9            sed -n -e ':loop' -e '/\\$/N' -e '/\\$/b loop' -e '/=/p' tmp/GO.sh >tmp/GO
10            . tmp/GO
11            cvs commit -m "  $VERSION"
12            cvs tag $VERSION
13            rm -rf tmp
14    
15  * from Zhong's dir  * from Zhong's dir
16          cd .../src/sml-nj          cd .../src/sml-nj
17          rm -rf **/CM          rm -rf **/CM
# Line 7  Line 19 
19          cvs -d ~cvs import -m '' smlnj/src/sml-nj FLINT v980311          cvs -d ~cvs import -m '' smlnj/src/sml-nj FLINT v980311
20    
21  * from tarballs  * from tarballs
22          # untar the distribution          cd ~/flint; ./bin/smlnj-newrev 110.9.1
23          mkdir 110.6; cd 110.6          cd trunk
         scp daffy:~ftp/pub/smlnj/working/110.6/\*.gz .  
         mkdir src; cd src  
         ztar ../*.gz  
         mv bin.* ../../  
         mv config ../  
         cd ..  
         mv *-bin.* ../  
         rm *.gz  
   
         # import this distribution into the CVS vendor branch  
         cvs -qd ~cvs import -ko -m '110.6' flint SMLNJ v110_6 | grep -v '^U '  
   
         # find the files that got deleted and `cvs rm' them  
         cd ..; cvs -d ~cvs co -d smlnj -r SMLNJ flint; cd smlnj  
         cvs rm $(cvs -q diff -s -r v110_6 | sed -n -e 's/^Index: //p')  
         cvs commit -m 'removed deleted files'  
         cvs tag v110_6  
         cd ..; rm -rf smlnj  
   
         # check out a new copy, trying to merge the changes into the trunk  
         cvs co -ko -P -jSMLNJ:yesterday -jSMLNJ flint; cd flint  
         # list the conflicts  
         find -type f | xargs grep '^>>>>'  
24          <... solve the problems if any ...>          <... solve the problems if any ...>
25          # check correctness          # check correctness
26          link ../bin.x86-unix; config/install.sh          rm -rf lib bin bin.* src/compiler/bin.*
27            link ../110.9.1/bin.x86-unix; config/install.sh
28          cd src/compiler; link ../../../bin.x86-unix; ./xrecompile; ./xrecompile          cd src/compiler; link ../../../bin.x86-unix; ./xrecompile; ./xrecompile
29    
30          cd ../..; cvs commit -m 'merged in 110.6 changes'          cd ../..; cvs commit -m 'merged in 110.6 changes'

Legend:
Removed from v.119  
changed lines
  Added in v.183

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