[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: update -jx -jy gives conflict on $Id$
From: |
Palle Girgensohn |
Subject: |
Re: update -jx -jy gives conflict on $Id$ |
Date: |
Fri, 09 Mar 2001 02:52:03 +0100 |
Stephen Rasku wrote:
>
> Palle Girgensohn wrote:
> >
> >$ cvs update -kk -jj1.13 file.c resolves this problem,
> >but -kk is sticky, which is not what I want.
> >
>
> Why is this a problem? You can always do "cvs update -A" after you
> have checked in your changes to get rid of the sticky tag.
Well, if I'm working on a branch, I must remember to "cvs
update -rBRANCH -A" or the file be updated to main trunk. Apart
from that, you're right, it is not a problem. I knew it was
simple... :)
Another way is to "cvs diff -kk -r1.13 -r1.14 | patch", I
guess.
Thanks,
Palle