RE: cvs update -kk -j Branch1 -j Branch2 does not ignore keywords?

[Josh Baudhuin]

Well, as a matter of practice, I tend to follow the scheme suggested in the 
documentation, "5.7 Merging from a branch several times" 
(http://www.cvshome.org/docs/manual/cvs_5.html#SEC61). I think I had it 
backwards in my example below, though. Anyway, I _do_ keep track of the last 
rev from which I merged from my SIDE branch to the main trunk.

0. Set up branch and merge-progress tag at same time:
        cvs rtag -b SIDE modules...
        cvs rtag SIDE-last-merged-to-MAIN modules...

When it's time to merge, then go to a sandbox with the main trunk (or whatever 
branch you want to merge to) checked out.

1. Merge everything from SIDE branch
        cvs update -kk -jSIDE-last-merged-to-MAIN -jSIDE

2. Clean up conflicts, and make sure it builds.

3. Commit it all
        cvs commit -m"Merged from SIDE branch"

4. Restore keywords (get rid of sticky tags, dates, flags)
        cvs update -A

Anyway, It was in step one that discrepancies in the fileset (files Added or 
Removed) would cause the  -kk  option to fall away. Weird.


> -----Original Message-----
> From: address@hidden [mailto:address@hidden Behalf Of
> David Rees
> Sent: Thursday, August 16, 2001 7:05 PM
> To: address@hidden
> Subject: Re: cvs update -kk -j Branch1 -j Branch2 does not ignore
> keywords?
> 
> 
> On Thu, Aug 16, 2001 at 05:40:43PM -0700, Josh Baudhuin wrote:
> > I think I ran into a problem like this--possibly the same issue. What I
> > noticed was that after a few (sibling) directories, the -kk option
> > started failing. It had to do with the fact that there were files added
> > or removed between the local (checkout'd) branch and the branch from
> > which I was merging. The merge was
> >     cvs update -kk -jBranchFOOTag -jLastMergedRevInBranchFOO
> > however, not specifying a second branch (which I would presume was
> > different from what you had checked out?)
> 
> More below...
> 
> > > I've been trying to merge one branch to another while ignoring 
> > > keywords with
> > > no luck.  Here's a synopsis of what I do:
> > > 
> > > cvs co mymodule
> > > cd mymodule
> > > cvs update -r Branch1
> > > cvs update -kk -j Branch1Tag -j HEAD
> 
> Branch1Tag in my case happens to be the same as the head of Branch1.
> The problem with merging two branches together (in my case 
> Branch1 and HEAD)
> is that if you intend to merge the braches together multiple times, you do
> have to keep track of the last point you merged with the other branch.
> 
> Are you suggesting that if I check out Branch1Tag, that the -kk 
> option will
> work as expected?
> 
> I believe that in my case if whether or not I was adding files to Branch1
> from HEAD didn't make a difference in behavior.
> 
> -Dave
> 
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/info-cvs
>