Christopher Fouts wrote:
This is done in userA's directory structure, which is based on
branchA correct? So no userA's files now have userB's changes
right? And now for the trunk to get userA's changes as well I
do a ...
cvs co proj
cvs up -j branchA
Correct?
The first time,
Thanks to ALL. I understand perfectly now, at least
more so than yesterday! :)
-chris
-Original Message-
From: Jim.Hyslop [mailto:[EMAIL PROTECTED]
Sent: Thursday, January 27, 2005 10:13 AM
To: Fouts Christopher (IFNA MP DC); info-cvs@gnu.org
Subject: RE: Merge question
Christopher
[EMAIL PROTECTED] writes:
When merging 2 branches, say HEAD to branchB, where
branchB contains files NOT YET in HEAD, the branchA
files get deleted. Any way to prevent this?
cvs up options??? -j branchA -j HEAD proj
IOW, what options do I need?
The ones you have, but you have to
Chris Fouts wrote:
When merging 2 branches, say HEAD to branchB, where
branchB contains files NOT YET in HEAD, the branchA
files get deleted. Any way to prevent this?
cvs up options??? -j branchA -j HEAD proj
This tells CVS Take the difference between the tip of branchA and the tip
of
Of Jim.Hyslop
Sent: Wednesday, January 26, 2005 12:18 PM
To: info-cvs@gnu.org
Subject: RE: Merge question
Chris Fouts wrote:
When merging 2 branches, say HEAD to branchB, where
branchB contains files NOT YET in HEAD, the branchA
files get deleted. Any way to prevent this?
cvs up options
++ Users Journal ( http://www.cuj.com/experts )
-chris
-Original Message-
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED]
] On Behalf Of Jim.Hyslop
Sent: Wednesday, January 26, 2005 12:18 PM
To: info-cvs@gnu.org
Subject: RE: Merge question
Chris Fouts wrote:
When merging
[EMAIL PROTECTED] writes:
I understand perfectly what the cvs command I outlined does.
It ain't the things you don't know that get you in trouble, it's the
things you know that just ain't so. You do *not* understand what the
CVS command you outlined does.
For simplicity, take just 2 users,
Mats Cullberg writes:
For some of the files I get the following message:
cvs update: file makefile.dep does not exist, but is present in revision
RELEASE-2-2.
I notice that this file does not get created in the trunk, what am I
doing wrong ?
That means that the file was deleted from
Mike Chartier wrote:
Graphically, this is how things look (in my mind):
Module
|
|
|
+ - Tagged "Software_1.0"
|\
| \
| \
|\
| |
| | - Tagged "Software_1.0_Update_1"
| |
+ - Tagged "Software_1.1"
