Public: User Documentation : TortoiseCVS FAQ's
This page last changed on Jan 14, 2005 by eblack.
CVS is pretty smart in that regard, but not completely flawless. If your local file is different from the one on the server, but the changes in the file are on different lines, it will try to merge the changes in your copy with the one it downloads. But, if the changes are on the same line, it will report a conflict and will ask you to manually fix it. It will mark the conflicting lines like this:
Where the <<<<<< build.xml and the line following are indicating the local file and >>>>> 1.15 and the line above is indicating the version on the server. If there are alot of differences, you would have to search for the shift symbols(> or <). This also doesn't work with binary files, such as word documents or image files. That is why you want to get in the habit of updating whenever you start working and committing whenever you are through.
Also, to see what will be updated before doing the real update, you could right click in your working copy and select CVS>Update Special... On the bottom of the dialog box that appears, you can select Simulate update and click ok. That will show you what would be updated and any conflicts that might arise before you do the real update.
There is a free program that will integrate with TortoiseCVS (or work on it's own) called WinMerge that will allow you to see the differences in color highlights, edit the files and save them. The link is http://winmerge.sourceforge.net. It has screen shots. If you want to install it, there is a link that says 'Download WinMerge 2.2 Installer', click on the link to go to the next page to select a mirror site. Once you click the little binary file icon in the download column, the file will be downloaded. After downloading, double click the installer to install it. Then when you want to use it with Tortoise, if you have a file with conflicts (the file will have a little red box with an exclamation point in it instead of the green box with a check) and you right click on the file, there will be a 'CVS Resolve Conflicts...' menu item. Click that to start WinMerge with the files to compare already loaded(you'll have to double click the file in a little dialog box that pops up). Incidently, WinMerge will create a copy of both files to compare called <file>.yours.<extension> and <file>.mine.<extension> in your Documents and Settings\<username>\Local Settings\Temp\<tempdirectory> folder so you can save them elsewhere if you'd want to. These temp files are in a hidden folder(see above) and will be deleted after WinMerge has stopped running. WinMerge is also useful on it's own as a difference editor which everyone needs occasionally.
The CVS server can be setup to handle binary files differently than text files. CVS will know if a binary file is different than another version, but will not be able to tell how. There are also other advanced features that are disabled/enabled by indicating binary file types on the server. Some common binary file types that are set on our CVS servers are:
There is a cvs move command but not in the TortoiseCVS client program you are using. The easiest method of moving a file is:
1. Copy file to new location
Renaming directories is not very easy, especially if there are alot of subdirectories. It is done sort of the same way as renaming files, where you copy the file to the new name, add the newly named file(cvs add), remove the old named file(cvs remove), and commit the changes(cvs commit). Doing the entire directory is similiar:
1. Copy the directory to the new name
To remove the hidden CVS files, you need to be able to see them. Most users have hiddden files and directories unviewable. To view them, you need to open Windows Explorer, select Tools>Folder Options..., select the View tab and click "Show hidden files and folders" (6th item in Advanced settings list box).
CVS history will start from the renaming point, although it is available through the original name for history prior to the renaming.
Folders are disappearing. I can create and add them, and they appear briefly with a little green tag (even though I haven't committed), but then they disappear.
The disappearing folder problem is due to a default option for cvs update that prunes(deletes) empty folders. To shut that off:
By default, yes. But that can also be disabled through the preferences.
|Document generated by Confluence on Jan 27, 2014 16:57|