From: Torsten M. <to...@ti...> - 2004-03-23 21:10:45
|
T. Eric Nicholson wrote: >I've run into a problem with the edit/commit procedure on unmodified files. We use VB for some of >our code, which occasionally sets the timestamp of a file without actually modifying it. Then >Tortoise doesn't know to edit the file, so it gets out of sync. Here's what happens: > >A user selects a VB .frm file (ascii) and .frx file (binary) pair to work on and "edits" both >files. >The user makes modifications to the source code (frm) but not binary info (frx). >VB saves actual changes to the frm, but only modifies the timestamp of the frx. >The user "commits" both files. >CVS commits the modified frm file, but realizes that the frx file is identical and does nothing. >Tortoise automatically unedits the frm, but leaves the binary frx file as "edited". > Actually, it's CVS that removes the edit from the file when committing. When the file is unchanged, no commit happens and therefore no unedit either. For this reason TortoiseCVS has an option in Preferences named "Automatic unedit". Try it and see if it solves your problem. -Torsten |