sm-grimoire AT lists.ibiblio.org
Subject: Discussion of Spells and Grimoire items
List archive
Re: [SM-Grimoire]So much time, so little to do. Hold it. Scratch That. Reverse i
- From: "Chris Brien" <christopher_brien AT hotmail.com>
- To: tony AT smee.org, eric AT sandall.us, sm-grimoire AT lists.ibiblio.org
- Subject: Re: [SM-Grimoire]So much time, so little to do. Hold it. Scratch That. Reverse i
- Date: Mon, 12 Aug 2002 17:28:58 +0100
From: Tony Smith <tony AT smee.org>
How can I find out:
a) the list of files in my workspace that have not been added to CVS.
b) the list of files in my workspace that have changed
c) the list of files in my workspace that have been deleted.
"cvs status" is the catch-all command for this. On a file, it will tell you if it's been modified locally or remotely or if it's been added or removed. On a directory, you can see the status of all files in that directory, even ones that are missing in your local file space. Usually you would want to automate a "cvs status -R" on the root directory and grep for the string "File:".
d) the correct commands (and flags) to check-in adds/edits/deletes.
To add a file, "cvs add" to remove a file "cvs remove". These don't actually modify the repository until you do "cvs commit". "cvs commit" also commits edits.
and lastly
e) what's the right way to handle the situation where I'm trying to submit
changes to a file which someone else has edited since my last "cvs update"?
First, do a "cvs update", which will cause cvs to merge any changes into your local files - if you don't, you'll get "Up-to-date check failed". Then "cvs commit". If you get a conflict during the update, then you have to merge manually before committing.
Hope this helps. As always, "man" is your friend.
Chris
aka zero_the_hero
_________________________________________________________________
Chat with friends online, try MSN Messenger: http://messenger.msn.com
- Re: [SM-Grimoire]So much time, so little to do. Hold it. Scratch That. Reverse i, Chris Brien, 08/12/2002
Archive powered by MHonArc 2.6.24.