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
>Su
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 firs
>-Original Message-
>From: Larry Jones [mailto:[EMAIL PROTECTED]
>Sent: Wednesday, January 26, 2005 3:09 PM
>To: Fouts Christopher (IFNA MP DC)
>Cc: info-cvs@gnu.org
>Subject: Re: Merge question
>
>
>[EMAIL PROTECTED] writes:
>>
>> I understand &quo
[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 use
to the trunk, then it's much simpler:
cvs update -A
cvs up -j [branch-tag]
--
Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. ( http://www.leitch.com )
Columnist, C/C++ Users Journal ( http://www.cuj.com/experts )
>
> -chris
>
> >-Original Message---
CTED]
>[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 2 branches, say HEAD to branchB, where
>> branchB contains files N
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 -j branchA -j HEAD proj
This tells CVS "Take the difference between the tip of branchA and the tip
of t
[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 -j branchA -j HEAD proj
>
> IOW, what options do I need?
The ones you have, but you have to
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 -j branchA -j HEAD proj
IOW, what options do I need?
--
Chris T Fouts
My CVS client is on Widows XP Professional version 2002 with
SP1.
I need to merge a branch to the trunk, and since we have
binary files in both places, I thought of performing the following steps to
avoid merging the binary files:
1.
From the trunk sand box, run the following c
tkCVS (or the like) is an excellent tool to resolve conflicts...
-chris
-Original Message-
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] On
Behalf Of Urban Gabor
Sent: Tuesday, June 01, 2004 10:53 AM
To: [EMAIL PROTECTED]
Subject: Branch/merge question
Hi,
I have a rather
Hi,
I have a rather specific issue here:
Suppose we have created a branch for a development in our
module called branch_A for a longer time. During the
development we have decided to intagrate all changes on the
main branch into branch_A (and we have tagged both the
main/HEAD and the branch). Aft
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
Hi !
I'm trying to merge a branch into the trunk.
standing in a trunk working copy. I execute :
cvs update -j RELEASE-2-2
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
Hi !
I'm trying to merge a branch into the trunk.
standing in a trunk working copy. I execute :
cvs update -j RELEASE-2-2
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
Mike Chartier wrote:
> Graphically, this is how things look (in my mind):
>
> Module
> |
> |
> |
> + - Tagged "Software_1.0"
> |\
> | \
> | \
> |\
> | |
> | | - Tagged "Software_1.0_Update_1"
> | |
> + - Tagged "Soft
Hi,
I have a codebase I would like to manage using CVS. At certain points in time
I want to create a "stable release" version.
I would like to keep each "stable release" in it's own branch. Bug fixes to
releases go out as updates.
Graphically, this is how things look (in my mind):
Module
17 matches
Mail list logo
