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 118, Fri Jun 5 21:38:17 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

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

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