Re: [OT] CVS help needed

2005-08-21 Thread erikweber
To: Struts Users Mailing List <[EMAIL PROTECTED]>, [EMAIL PROTECTED] Subject: Re: [OT] CVS help needed On 8/21/05, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote: > I hope one of you fellow night owls can help me. > > I have a CVS problem that doesn't come up much I guess. I

Re: [OT] CVS help needed

2005-08-21 Thread Craig McClanahan
On 8/21/05, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote: > I hope one of you fellow night owls can help me. > > I have a CVS problem that doesn't come up much I guess. I need to merge files > from the trunk to a branch. Note that this is the *opposite* of a common > situation -- where the need i

Re: [OT] CVS help needed

2005-08-21 Thread Frank W. Zammetti
-j MY_BRANCH -jHEAD myFile This merges all changes in the trunk since the branch was made into the branch. Erik -Original Message- From: [EMAIL PROTECTED] Sent: Aug 22, 2005 12:28 AM To: [EMAIL PROTECTED] Subject: [OT] CVS help needed I hope one of you fellow night owls can help me.

Re: [OT] CVS help needed

2005-08-21 Thread Frank W. Zammetti
Eric, when you say trunk, do you mean head? If so, would it be feasible to just delete the tag for your branch and re-tag head with that tag? Assuming that ALL the changes in head are changes you want to add to the branch, I *think* this will have the desired effect. Not sure if it has an und

Re: [OT] CVS help needed

2005-08-21 Thread erikweber
unk since the branch was made into the branch. Erik -Original Message- From: [EMAIL PROTECTED] Sent: Aug 22, 2005 12:28 AM To: [EMAIL PROTECTED] Subject: [OT] CVS help needed I hope one of you fellow night owls can help me. I have a CVS problem that doesn't come up much I guess. I

[OT] CVS help needed

2005-08-21 Thread erikweber
I hope one of you fellow night owls can help me. I have a CVS problem that doesn't come up much I guess. I need to merge files from the trunk to a branch. Note that this is the *opposite* of a common situation -- where the need is to merge files from a branch to the trunk. A branch was created