Discourage combining student contributions late.

Talk about SourceForge.

diff --git a/EXPERIENCE b/EXPERIENCE
index dd5b66516fcf3c342b0543f1df23bc2e823582fa..76231d13fd9a8f97eb2b71665481b2ca9f2ac548 100644 (file)
--- a/EXPERIENCE
+++ b/EXPERIENCE
@@ -2,10 +2,6 @@
 
 General:
 
-  - Lots of groups only tried combining the 3 group members' parts
-    only in the last few hours.  Emphasize that this is a bad choice.
-    Encourage them to use CVS/sourceforge/etc.
-
   - Suggest where to start in each assignment?
 
   - Provide more tests!

diff --git a/doc/devel.texi b/doc/devel.texi
index 20af12f69b419bdb5ce8df583dc707d995a45cef..86c47f471e7c3cb764cfd1aae939adcc2eeb4a0c 100644 (file)
--- a/doc/devel.texi
+++ b/doc/devel.texi
@@ -6,6 +6,7 @@ Here are some tools that you might find useful while developing code.
 @menu
 * Tags::                        
 * CVS::                         
+* SourceForge::                 
 * VNC::                         
 @end menu
 
@@ -45,6 +46,17 @@ the projects.
 For more information, visit the @uref{https://www.cvshome.org/, , CVS
 home page}.
 
+@node SourceForge
+@section SourceForge
+
+SourceForge is a web-based system for facilitating software
+development.  It provides you with a version-control system (typically
+CVS, as described above) and other tools for tracking your software.
+You can use it to store files, track bugs, and post notes about
+development progress.  It's also free.  You can set up your own
+project in SourceForge at @uref{http://sourceforge.net, ,
+sourceforge.net}.
+
 @node VNC
 @section VNC
 

diff --git a/doc/threads.texi b/doc/threads.texi
index eb59d8a4267de1629c3f3d30037faab13c4d5a8b..8e6e38de64de1b93777a2e5f3770c094d321c612 100644 (file)
--- a/doc/threads.texi
+++ b/doc/threads.texi
@@ -383,6 +383,24 @@ Problems 1-3 and 1-4 won't be needed for later projects.
 Problem 1-4 (MLFQS) builds on the features you implement in Problem
 1-3.  You should have Problem 1-3 fully working before you begin to
 tackle Problem 1-4.
+
+@item
+In the past, many groups divided the assignment into pieces, then each
+group member worked on his or her piece until just before the
+deadline, at which time the group reconvened to combine their code and
+submit.  @strong{This is a bad idea.  We do not recommend this
+approach.}  Groups that do this often find that two changes conflict
+with each other, requiring lots of last-minute debugging.  Some groups
+who have done this have turned in code that did not even successfully
+boot.
+
+Instead, we recommend integrating your team's changes early and often,
+using a source code control system such as CVS (@pxref{CVS}) or a
+group collaboration site such as SourceForge (@pxref{SourceForge}).
+This is less likely to produce surprises, because everyone can see
+everyone else's code as it is written, instead of just when it is
+finished.  These systems also make it possible to review changes and,
+when a change introduces a bug, drop back to working versions of code.
 @end itemize
 
 @node Problem 1-1 Alarm Clock