[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Josh Baudhuin
Subject: RE: cvs update -kk -j Branch1 -j Branch2 does not ignore keywords?
Date: Thu, 16 Aug 2001 17:40:43 -0700

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?)

> -----Original Message-----
> From: address@hidden [mailto:address@hidden Behalf Of
> David Rees
> Sent: Thursday, August 16, 2001 4:51 PM
> To: address@hidden
> Subject: cvs update -kk -j Branch1 -j Branch2 does not ignore keywords?
> Hi,
> 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
> Now the merge happens fine, but for files which haven't changed between
> Branch1Tag and HEAD (except for $Id$ and $Revision$ tags of 
> course) get the
> $Id$ and $Revision$ tag from the HEAD branch.  So I end up 
> checking in a lot
> of files unnecessarily.
> Is this a bug or desired behavior?  Is there any easy way to prevent this
> from happenning except for manually sorting through cvs diff and undoing
> changes to files?
> Thanks,
> Dave
> _______________________________________________
> Info-cvs mailing list
> address@hidden

reply via email to

[Prev in Thread] Current Thread [Next in Thread]