git/list[1] front-page[2] threads[3] people[4] search[5] about
 

RE: Updating Files

From
BGBrand, Greg <greg.brand@nordsonasymtek.com>
Date
Nov 10, 2011, 00:54 UTC
Message-ID
<338A71EC3E356A47BF5279971E4EF72A04D860D7F6@WESMSG51.nordsoncorp.local>
Good Day,

Let me begin by describing my SCM experience. I am an old school UNIX guy, and grew up with RCS. I have written many BASH and CSH scripts for RCS.

Moving on, the next logical step was CVS. I've worked with (and administered) CVS for the last 12 years. I have also worked with SourceSafe (ugh), Perforce and ClearCase.

I am an avid CVS proponent.

I have Recently changed jobs, to a SourceSafe shop. We HAVE to move to something different.

I've played with both Subversion and GIT. I REALLY like GIT, but have some questions.

For my questions, I will use a CVS comparison sense this is what I'm most familiar with.
- Updating a File: 
   ~ CVS's default behavior, is to try to merge changes from the repository into my local copy. Sometimes, this isn't desirable. 
   ~ With CVS I can also choose to get a "clean" copy. If the file I'm updating has been modified, CVS will create a backup of the original file before updating to the clean version. The backup file is saved as a "hidden" file, with the format:
               .<filename>.revision
   ~ Does GIT have the same, or similar options???  I understand with the distributed nature of GIT, there may be several ways to accomplish this. It is nice, though, to be able to get a clean version without losing changes you may (or may not) want to keep.

Thank you for your help. I am sure I will have more questions.

Best Regards, Greg Brand

_____________________________________________________________________________ Scanned by IBM Email Security Management Services powered by MessageLabs. For more information please visit http://www.ers.ibm.com

This email is intended only for the use of the party to which it is addressed and may contain information that is privileged, confidential, or protected by law.  If you are not the intended recipient you are hereby notified that any dissemination, copying or distribution of the email or its contents is strictly prohibited.  If you have received this message in error, please notify us immediately, by replying to the message and deleting it from your computer.
WARNING: Internet communications are not assured to be secure or clear of inaccuracies as information could be intercepted, corrupted, lost, destroyed, arrive late or incomplete, or contain viruses.  Therefore, we do not accept responsibility for any errors or omissions that are present in this email, or any attachment, that have arisen as a result of e-mail transmission.
_____________________________________________________________________________
Next: Andrew Ardill
Message 1 of 3 in “RE: Updating Files”
  1. Brand, GregNov 10, 2011
  2. Andrew ArdillNov 10, 2011
  3. Ben WaltonNov 10, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.