I want to do a diff between multiple files (that appear modified in WinCVS)
and the repository.
I have a huge amount of files that have only differences like:
#$RCSfile: toto.cml,v $
---
#$RCSfile: toto_gcc.cml,v $
Within WinCVS I have coped with the CVS keywords with the diff -ko option
but
Yves == Yves Martin [EMAIL PROTECTED] writes:
I.e. it is not possible, by definition, to resolve merge
conflicts in any ``binary'' file. Period.
Yves Close to the subject, I would like to know how a unicode
Yves file should be added in CVS ? Is it OK to add it as a text
Hi,
I tried the method given in your response:-
Added
env+= TMPDIR=/path/to/some/other/directory/for/tmp
In cvspserver.
It works!! Thanks very much the guidance.
Regards,
Ahalya
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Mark D.
Tyler wrote:
I have been negligent in my record-keeping and find that i
don't know from what branch i cut a new branch. That is, did
i cut feature branch FEATURE from the trunk, or from release
branch RELEASE?
Most of the work on FEATURE touches new files or files that
haven't changed
I have a question about how people use CVS. How common is it to always
checkout and update read-only, and then use cvs edit when you start
working on a file? Or, do people checkout read-write and never use cvs
edit? I have always thought that modules should be checked out
read-only, and cvs
On Wed, 2004-07-07 at 14:01, Karr, David wrote:
Or, do people checkout read-write and never use cvs
edit?
Yup, that's what I do. Optimistic locking and all that sort of thing,
you know...
Yours,
Tom
___
Info-cvs mailing list
[EMAIL PROTECTED]
At 02:01 PM 7/7/2004, Karr, David wrote:
Other SCMs use the strategy that I'm used to as the primary strategy
(checkout read-only, and do a specific operation to put the file into
edit mode).
Not CVS. That C stands for Concurrent. You can find out what that means
at
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Hi David,
'cvs edit' and 'cvs watchers' is something that was bolted on to cvs as
a way to give advistory locking to cvs for files that are difficult to
merge.
In general, I never use it (other than to test that the feature still
appears to work).
We never use cvs edit. In my opinion, that negates the whole benefit
of the C in CVS.
-Original Message-
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] On Behalf Of
Karr, David
Sent: Wednesday, July 07, 2004 2:02 PM
To: [EMAIL PROTECTED]
Subject: Do most people checkout read-only and
I'm not talking about locking. It's always impractical to check out
with locks, in any SCM. I'm just talking about what happens in the
user's client view. I was under the impression before that cvs edit
just affects the file in the user's client view. Does this also lock
the file on the
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Karr, David [EMAIL PROTECTED] writes:
I'm not talking about locking. It's always
impractical to check out with locks, in any
SCM.
Hmmm... 'cvs edit' implies locking, so, your
question asked all of us about 'locking' even if
you did not know that
I don't believe the 'edit' does a lock on the server.
Quoting Vesperman's book:
The cvs edit command is used as part of the cvs watch family of commands.
If a file is being watched, it is checked out to the sandbox with read
permissions but not write permissions. The edit command sets the
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
JGentilin [EMAIL PROTECTED] writes:
I don't believe the 'edit' does a lock on the server.
Why take it on faith when you have the source?
Go and look it up if you wish. It is not much
of a 'lock', but for many definitions of the term
it is a 'lock'
13 matches
Mail list logo
