On Mon, Apr 02, 2007 at 12:35:42PM -0400, Michael Jennings wrote:
> That puts a lot of undue strain on our CVS server(s) for no good
> reason.  If you have one or more files that show up with conflicts
> (that's what the 'C' at the beginning of the line means), and you know
> you haven't directly/intentionally modified those files, remove JUST
> THOSE FILES and redo the update.
> 
> Ignorance is bliss, but knowledge is power.  Personal preference, I
> guess.

Michael, I think people get frustrated because you come across as
saying "Well ya know, that's a stupid way to do what you want" without
providing any actual education.

Jim and Charles: "cvs -CPd update" is what you want when your aren't doing
active development.  It forces overwriting files with conflicts,
prunes empty directories, and checks out new directories.

And before Michael starts flaming, I'm running cvs 1.12.13.  I have no
idea if these options exist in anyone's particular version and make no
representation as to your actual ability to use them.

But it works for me!


-- 
Ross Vandegrift
[EMAIL PROTECTED]

"The good Christian should beware of mathematicians, and all those who
make empty prophecies. The danger already exists that the mathematicians
have made a covenant with the devil to darken the spirit and to confine
man in the bonds of Hell."
        --St. Augustine, De Genesi ad Litteram, Book II, xviii, 37

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-users

Reply via email to