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
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
Cool! Disregard my reply :)
Frank
[EMAIL PROTECTED] wrote:
Well the next article I looked at showed me how to accomplish this. Sorry for the OT. I
didn't realize you could pass "HEAD" to the -j option.
But, here's the solution:
switch to the branch and then:
cvs update -j MY_BRANCH -jHEAD
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
Well the next article I looked at showed me how to accomplish this. Sorry for
the OT. I didn't realize you could pass "HEAD" to the -j option.
But, here's the solution:
switch to the branch and then:
cvs update -j MY_BRANCH -jHEAD myFile
This merges all changes in the trunk since the branch wa
5 matches
Mail list logo
