what's the best way to make sure that a "cvs update" really brings everything up to date, even if you've accidentally changed some- thing in your local workspace?
</F>
Fredrik Lundh writes:
what's the best way to make sure that a "cvs update" really brings everything up to date, even if you've accidentally changed some- thing in your local workspace?
Delete the file(s) that got changed and cvs update again.
-Fred
-- Fred L. Drake, Jr. fdrake@acm.org Corporation for National Research Initiatives
Fred L. Drake, Jr. wrote:
Fredrik Lundh writes:
what's the best way to make sure that a "cvs update" really brings everything up to date, even if you've accidentally changed some- thing in your local workspace?
Delete the file(s) that got changed and cvs update again.
okay, what's the best way to get a list of locally changed files?
(in this case, one file ended up with neat little <<<<<<< and
marks in it... several weeks and about a dozen CVS
updates after I'd touched it...)
</F>
Delete the file(s) that got changed and cvs update again.
okay, what's the best way to get a list of locally changed files?
Diff the directory. Or better still, use wincvs - nice little red icons for the changed files.
(in this case, one file ended up with neat little <<<<<<< and
> marks in it... several weeks and about a dozen CVS
updates after I'd touched it...)
This happens when CVS can't manage to perform a successful merge. You original is still there, but with a funky name (in the same directory - it should be obvious).
WinCV also makes this a little more obvious - the icon has a special "conflict" indicator, and the console messages also reflect the conflict in red.
Mark.
On Sat, 13 May 2000, Fredrik Lundh wrote:
Fred L. Drake, Jr. wrote:
Fredrik Lundh writes:
what's the best way to make sure that a "cvs update" really brings everything up to date, even if you've accidentally changed some- thing in your local workspace?
Delete the file(s) that got changed and cvs update again.
okay, what's the best way to get a list of locally changed files?
I use the following:
% cvs stat | fgrep Local
Cheers, -g
On 13 May 2000, Fredrik Lundh said:
what's the best way to make sure that a "cvs update" really brings everything up to date, even if you've accidentally changed some- thing in your local workspace?
Try the attached script -- it's basically the same as Greg Stein's "cvs status | grep Local", but beefed-up and overkilled.
Example:
$ cvstatus -l .cvsignore Up-to-date 2000-05-02 14:31:04 Makefile.in Locally Modified 2000-05-12 12:25:39 README Up-to-date 2000-05-12 12:34:42 acconfig.h Up-to-date 2000-05-12 12:25:40 config.h.in Up-to-date 2000-05-12 12:25:40 configure Up-to-date 2000-05-12 12:25:40 configure.in Up-to-date 2000-05-12 12:25:40 install-sh Up-to-date 1998-08-13 12:08:45
...so yeah, it generates a lot of output when run on a large working tree, eg. Python's. But not as much as "cvs status" on its own. ;-)
Greg
PS. I just noticed it uses the "#!/usr/bin/env" hack with a command-line option for the interpreter, which doesn't work on Linux. ;-( You may have to hack the shebang line to make it work.
participants (5)
-
Fred L. Drake, Jr. -
Fredrik Lundh -
Greg Stein -
Greg Ward -
Mark Hammond