I
think you will have deleted too much if you eliminate everything from
<<<< to >>>>. When files have been modified
locally, and someone makes changes in the CVS repository, then when you
do a cvs update, cvs will try to merge the repository
changes into the copy you have modified. But sometime it can't figure
out how to make those changes. The line you quote above, which is
<<<<<<< Stats.pm
debug("Begin obtaining problem records for user $student set $setName");
=======
debug("Begin obtaining problem records for set $setName");
>>>>>>> 1.58
Says that the local copy of Stats.pm has the first debug line in
it and that that was a local edit (i.e., it is not the line that is
supposed to be there in the version you ahve checked out), while the
new version (1.58) has the second debug line. CVS can't tell if the new
line from the CVS repository should be used, or the edited line from
your copy, so it flags the problem and asks you to resolve it. The cvs update
command should have given some sort of warning like "conflicts exist"
and marked the file with a "C". That is your clue to the fact that you
have to edit that file by hand and look for the <<<< and
choose what should really be there.
If you delete from <<<< to >>>> you will
remove BOTH choices, and that will mean that some code is now missing
from your version of the file (after all, one or the other of the two
choices should probably be there). In this case, since it is a debug
call, that probably is OK, but in general, this would not be a good way
to resolve the problem.
The fact that you now see "M Stats.pm" means that your copy of Stats.pm
has local modifications (namely the missing debug command). Unless you
are really meaning to have modified versions of the webwork files, you
probably don't want to see "M" indicators on any files. If you want to
get a "clean" copy, you can always delete the .pm file and update
again; that should check out a fresh copy from the repository with no
local edits.
(Of course, if you HAVE been modifying your copies of the files, you
should expect to see "M" listings.)
Hope that helps.
Davide
<| Post or View Comments |>
|