Dear Cvs users
I have a problem getting cvs branch merging working
I have a main branch for our website content, and a
development branch for our test environment. How do I
merge the new content in the main branch (stuff in
after
code freeze lifted) and a few bug fixes from the dev
branch?
Andy Bradford wrote:
Thus said "Alexander Kamilewicz" on Wed, 28 Mar 2001 10:24:34 CST:
Usually this is caused by someone doing an update while they have a file
loaded into a text editor and then saving the file over top of the
merged version (wiping out the merged changes) and then
"Alexander Kamilewicz" [EMAIL PROTECTED] writes:
Andy Bradford wrote:
Thus said "Alexander Kamilewicz" on Wed, 28 Mar 2001 10:24:34 CST:
Usually this is caused by someone doing an update while they have a file
loaded into a text editor and then saving the file over top of the
I want to kinda set and forget my cvswrappers file. I have a
mixed Win/unix dev environment and I want to set and forget
which file are binary and which are not.
SO - I created the following cvswrappers file (all ~700 extensions)
that are most likely binary. I got it by scanning my Win
Hello,
Well, I won't ask why you want ot check any of this stuff into
CVS ;)
You can just do this :
*.[Dd][Oo][Cc]
to cover all possible capitalizations of .doc files, for instance.
HTH,
Rob Helmer
On Thu, Mar 29, 2001 at 09:26:06AM -0800, Gianni Mariani wrote:
I want to kinda set
I am having problems with MacCVS on a few machines and I need to change the location
where the .cvspass file lives. Does anyone know how I may do this? Reason being, the
.cvspass file is currently in the boot hard drive which has been named "Computer
Boot/Sys". MacCVS tries to find the
On Thu, Mar 29, 2001 at 09:26:06AM -0800, Gianni Mariani wrote:
SO - I created the following cvswrappers file (all ~700 extensions)
that are most likely binary. I got it by scanning my Win drives
for all extensions, running 'file' on them and removing any extensions
which 'file' reported as
Is it possible to convince Wincvs to use the rsh (:server:) connection method
rather than the pserver method described in the Wincvs docs? I don't want to
have to mess with sysadmin to change the inetd. I am willing to limit use
to trusted machines listed in rhosts. When I try setting the
Ezequiel Valenzuela writes [in very long lines]:
Recently I have added a directory tree to my CVS repository which I
don't want to be there anymore (more specifically, it's been added
erronously).
[...]
How can I do to make a 'politically correct' removal of the whole
thing? I have no
Hi.
I don't understand what is happening here. I get:
/usr/local/cvsrepos/leda/httpd/deposit/upload.php3,v -- upload.php3
new revision: 1.3; previous revision: 1.2
done
cvs commit: cannot change mode of file upload.php3: Operation not permitted
cvs commit: cannot change mode of file
Just a guess, but perhaps CVS is trying to remove write
permission from the upload.php3 file in your sandbox. It would
do this if you had CVS_READ set in your environment; or, I
gather, if you're using watches.
On Thu, Mar 29, 2001 at 04:30:43PM -0500, Brian Hughes wrote:
Hi.
I don't
Brian Hughes writes:
/usr/local/cvsrepos/leda/httpd/deposit/upload.php3,v -- upload.php3
new revision: 1.3; previous revision: 1.2
done
cvs commit: cannot change mode of file upload.php3: Operation not permitted
cvs commit: cannot change mode of file upload.php3: Operation not permitted
Larry Jones wrote:
Jeffrey Liu writes:
when tester commit change, the email notification is from "pubcvs@"
What do we need to change so that commit notification is sent from
tester,
real user account, not from a shared account(pubcvs)?
Brad,
You cannot
The problem is probably the '/' in the name of the drive
Regards,
alex.
- Original Message -
From: "Brad Pfautsch" [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Thursday, March 29, 2001 11:15 AM
Subject: MacCVS
I am having problems with MacCVS on a few machines
Steve,
You don't login for rsh, you just set-up a ~/.rhosts file in the user
account of the server machine.
Regards,
alex.
- Original Message -
From: "Steve Rabin" [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Thursday, March 29, 2001 1:25 PM
Subject: Can Wincvs use rsh (:server:)
Hi ,
As a new user of CVS , I have one peculiar
problem while seeing the logs using loop.
Please see the following piece of code ( shell script ) :
case 1 :
cvs
log ` find source_dir/
-type f `
This is working fine and we can get the proper result
But in
case 2 :
for
files in ` find
Hello fiends,
I need some help ,
We have got CVS Server running on Linux.
I have got jCVS client installed on Solaris Server and it is running
fine on Solaris,
We have got NT Workstations and the users connect to the Sun
Servers using Exceeds 6.2 ( X-Emulation Software ).
Once they have
I've had a number of suggestions below to do a more complete coverage of
cvswrappers.
Thanks to all who have responded, I have attached my cvswrappers file -
consider it public domain. *STANDARD DISCLAIMER* ... I take no
responsibility yadda yadda, it IS YOUR FAULT if it breaks your files,
[ On Thursday, March 29, 2001 at 22:21:29 (-0800), Gianni Mariani wrote: ]
Subject: RE: cvswrappers - any better suggestions ?
I would actually call this a major deficiency in CVS - it should probably
assume binary by default, or even use the command 'file' to detect the file
type on adding
19 matches
Mail list logo
