DragonFly bugs List (threaded) for 2004-07
Re: kernel trap 12
On Thu, Jul 22, 2004 at 09:25:10AM +0200, Jeroen Ruigrok/asmodai wrote:
> -On [20040722 09:12], YONETANI Tomokazu (qhwt+dragonfly-bugs@xxxxxxxxxx) wrote:
> >Any chance you set sticky revision on the file?
> >$ cvs update -r1.9 nexus.c
> >sets sticky revision 1.9 on nexus.c, while
> Mmm, yes, I did that.
> Funny, since I can remember that it got cleared on checkouts when I was
> still using 1.11.x many months ago. At least that's my memory.
I think that's because you had `checkout -A' line in your ~/.cvsrc
file. At least cvs command in FreeBSD does not clear the sticky revision
when I did `cvs checkout'. By the way, having -A flag in your ~/.cvsrc is
OK as long as you're only interested in the tip of CVS, but is harmful
when you deal with repositories which have multiple branches(i.e., -rRELENG_4
for FreeBSD-STABLE, -A for FreeBSD-CURRENT).
> Anyhow, it wasn't the issue at hand. Thanks for reminding me about it.
> Personally I think it is non-intuitive.
> >$ cvs update -j1.10 -j1.9 nexus.c
> Again non-intuitive.
Well, although notation is non-intuitive, this is just a `merge' operation
$ svn merge -r 10:9 nexus.c
(assuming nexus.c,1.10 is in version 10 and nexus.c,1.9 in version 9)
to backout particular changes without altering the version.
The result of merge stays in your working copy as local modification,
so you don't need to re-apply the backout every time you updated the
source tree until it produces conflicts.