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 115, Fri Jun 5 19:43:05 1998 UTC revision 119, Fri Jun 5 22:03:51 1998 UTC
# Line 26  Line 26 
26          cvs rm $(cvs -q diff -s -r v110_6 | sed -n -e 's/^Index: //p')          cvs rm $(cvs -q diff -s -r v110_6 | sed -n -e 's/^Index: //p')
27          cvs commit -m 'removed deleted files'          cvs commit -m 'removed deleted files'
28          cvs tag v110_6          cvs tag v110_6
29            cd ..; rm -rf smlnj
30    
31          # 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
32          cd ..; cvs co -ko -P -jSMLNJ:yesterday -jSMLNJ flint; cd flint          cvs co -ko -P -jSMLNJ:yesterday -jSMLNJ flint; cd flint
33          # list the conflicts          # list the conflicts
34          find -type f | xargs grep '^>>>>'          find -type f | xargs grep '^>>>>'
35          <... solve the problems if any ...>          <... solve the problems if any ...>
         # check files that have been removed  
         changes=$(cvs -q diff -N -r v110_5_1 -r v110_6 | sed -n -e 's/^Index: //p')  
         cd ../110.6; for f in $changes; do if [ ! -f "$f" ]; then echo $f; fi; done  
         cd ../flint; cvs rm <..some or all of the above..>  
36          # check correctness          # check correctness
37          link ../bin.x86-unix; config/install.sh          link ../bin.x86-unix; config/install.sh
38          cd src/compiler; link ../../../bin.x86-unix; ./xrecompile; ./xrecompile          cd src/compiler; link ../../../bin.x86-unix; ./xrecompile; ./xrecompile
# Line 60  Line 57 
57          cd ../..          cd ../..
58          rm -r bin lib **/CM          rm -r bin lib **/CM
59          config/install.sh          config/install.sh
60          rm bin.*/*          rm -rf bin.*/*
61    
62    * diffs between release
63    ** sml-nj/TopLevel/viscomp/control.sml
64    -      val checkFlint     = ref false
65    -      val checkDatatypes = ref false
66    -      val checkKinds     = ref false
67    +      val checkFlint     = ref true
68    +      val checkDatatypes = ref true
69    +      val checkKinds     = ref true
70    ** runtime/gc/import-heap.c
71    --- import-heap.c       1998/01/18 01:00:25     1.1.1.2
72    +++ import-heap.c       1998/03/22 22:26:22     1.2
73    @@ -168,7 +168,7 @@
74           /* read the ML heap */
75            ReadHeap (&inBuf, &heapHdr, msp, externs);
76           /* GC message are on by default for interactive images */
77    -       GCMessages = TRUE;
78    +       /* GCMessages = TRUE; */
79         }
80         else {  /* EXPORT_FN_IMAGE */
81            ml_val_t        funct, cmdName, args;
82    ** sml-nj/TopLevel/interact/evalloop.sml
83    --- evalloop.sml        1998/04/03 00:06:01     1.1.1.4
84    +++ evalloop.sml        1998/04/03 00:11:31
85    @@ -173,7 +173,7 @@
86                   handle EndOfFile => (say "\n")
87                       | Interrupt => (say "\nInterrupt\n";
88                                   flush(); loop())
89    -                  | EM.Error => (flush(); loop())
90    +                  (* | EM.Error => (flush(); loop()) *)
91                       | C.Compile "syntax error" => (flush(); loop())
92                       | C.Compile s =>
93                          (say(concat["\nuncaught exception Compile: \"",

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

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