Date: Tue, 25 Jun 2002 09:37:49 -0700 (PDT) From: Scott Hess <scott@avantgo.com> To: Makoto Matsushita <matusita@jp.FreeBSD.org> Cc: hackers@freebsd.org Subject: Re: cvs(1) bug? with cvs update -rX -DY Message-ID: <Pine.LNX.4.44.0206250915150.4336-100000@river.avantgo.com> In-Reply-To: <20020625132020U.matusita@jp.FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 25 Jun 2002, Makoto Matsushita wrote: > I found a strange behavior of cvs (see sample session below). > > Checking out the source codes seems OK, but when I update the codes with > -r and -D options, source codes are disappeared. cvs update with -r > option only is OK for me. > > Is it a bug, or just my misunderstandings of cvs behavior? I've noticed this, and it's annoying. If you do 'cvs update -r TAG -r TAG', you get updated with the changes between the two tags. If you do 'cvs update -D DATE -D DATE', you get the changes between the two dates on the trunk. 'cvs update -r TAG -D DATE' gives you the changes between the given TAG and the given DATE on the trunk, which is pretty bad if TAG is a branch tag. This also applies to diff. rtag has a similar issue, where you can't lay down a tag for a given date on a branch - you can tag by tag or by date, not by both. To accomplish that, you have to check things out by tag and date (which works fine), and tag the result. [I only mention it because if you could rtag by tag+date, then there's an easy workaround for the update and diff issue.] You could simply pop up a couple directories and checkout the given tag and date over your existing checkout. CVS is smart enough to notice that you've already got something checked out, and it will just update things. You also might be able to work around it by using -j, which allows TAG:DATE. Something like 'cvs update -j TAG:OLDDATE -j TAG:TARGETDATE' (OLDDATE is the date you used when you originally checked the project out). It would be great if -r allowed TAG:DATE, scott To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.LNX.4.44.0206250915150.4336-100000>