merge or branch?

2001-09-27 Thread Christine & Freight
Hey Folks~ I am having a dispute with a co-worker over how to do something in CVS. I was wondering if anyone out there can help? Here's the situation: A branch (let's call it branchA) gets created off the main line. Then, at some point in time, a branch (branchB) gets created off of branchA.

Re: merge or branch?

2001-09-27 Thread Rachman Chavik
At 23:42 27/09/2001 +, you wrote: >Development continues down branchA, and a new directory, with new files, >gets added and committed on branchA. This new directory is obviously not on >branchB, since it was created after branchA was created. I would suggest that you perform the new addition

Re: merge or branch?

2001-09-28 Thread Stephen Cameron
> From: Christine & Freight ([EMAIL PROTECTED]) > I am having a dispute with a co-worker over how to do something in CVS. I > was wondering if anyone out there can help? Here's the situation: > > A branch (let's call it branchA) gets created off the main line. Then, at > some point in time, a

Re: merge or branch?

2001-09-28 Thread Christine & Freight
Thanks Steve. Yep, I created a branch origin tag, so I know where the branch forked off. I appreciate the help! ~Christine "Stephen Cameron" <[EMAIL PROTECTED]> wrote in message news:[EMAIL PROTECTED]... > > From: Christine & Freight ([EMAIL PROTECTED]) > > I am having a dispute with a co-work