If I am correct, you can do an update-commit rather than
commit-update-commit.
The display of 'M' means that your changes were merged with other changes
commited into the repository after you last got the file and CVS has not
checked in the file so you can look at it. This normally happens if you get
a file and start modifying it. While modifying it somebody else modifies the
same file and commits their changes before you do. When you commit, CVS
looks at the repo and sees that the file has changed since you last got it
and merges your changes with the other changes (so the other changes are not
lost).
If CVS displays a 'C', this means that the merge process encountered
conflicts between your changes and the other person's changes (e.g. you
modified the same line of code).
Thus if you do an update before commit, any merging will occur which you can
check and then commit your changes.
This is the beauty of not having locks on the repository when you modify
files. It allows developers to "keep going" when they want to make
modifications to a different area of the same source file as you do.
Regards
John Scott
IS Middleware Services
Argos Ltd
-----Original Message-----
From: Louis-David Mitterrand [mailto:[EMAIL PROTECTED]]
Sent: 25 July 2000 08:15
To: [EMAIL PROTECTED]
Subject: must do (1) commit then (2) update then (3) re-commit
Hello,
Is it normal that somtimes when several files have been edited that I
must do and commit-update-commit cycle in order to have every change
commited?
Often after the first commit some changed files are still not commited
to the repository. Only after running an update (files have not changed
on the repository, so updated merely displays 'M' on still-not-commited
local files) will all remaining files be committed.
Am I missing something here?
TIA.
--
Louis-David Mitterrand - [EMAIL PROTECTED] - http://www.apartia.org
"Perl Guy and Executive Glue Sniffer" (stolen from Aaron Sherman's .sig)
********************************************************************
The information contained in this message or any of its
attachments may be privileged and confidential, and is
intended exclusively for the addressee.
The views expressed may not be official policy, but the
personal views of the originator. If you are not the
addressee, any disclosure, reproduction, distribution,
dissemination or use of this communication is not authorised.
If you have received this message in error, please advise
the sender by using the reply facility in your e-mail software.
All messages sent and received by Argos Ltd. are checked
for malicious content.
********************************************************************
application/ms-tnef
