Obtain status information

When you work on your work copy, you often need to know which files you have modified, added, deleted, or renamed, or even the file has been modified and submitted by others.

Icon Overloading

Figure 5.12. Resource Manager displaying the reload icon

Now that you have detected a working copy from the Subversion library, you can check the icons of these files in the resource manager. This is one of the reasons why tortoisesvn is so popular. Tortoisesvn adds the function called overload icon to reload the original file icon. The reload icons vary depending on the file's Subversion status.

A new detected work copy is reloaded with a green check mark. Indicates the Subversion status.Normal.

After you start editing a file, the status changesModifiedThe icon reload turns into a red exclamation point. In this way, you can easily see which files have been modified since you last updated the work copy and need to be submitted.

IfConflictThe icon will become a yellow exclamation point.

If you setsvn:needs-lockAttribute, subversion will make this file read-only until you get the file lock. Files with this overload icon indicate that you must get the lock before editing.

If you have a file lock and the subversion status isNormalThis overload icon reminds you to release the lock if you do not use the file and allow others to submit modifications to the file.

This icon indicates that some files or folders in the current folder have been scheduled from version control.DeleteOr a version-controlled file in the folder is lost.

The plus sign indicates that a file or directory has been scheduled.JoinVersion control.

The bar sign tells you that a file or folder isIgnoredFor version control purposes. This overlay is optional.

This icon shows files and folders which are not under version control, but have not been ignored. This overlay is optional.

In fact, you may find that not all of these icons are used on your system. this is because the number of overlays allowed by Windows is very limited and if you are also using an old version of tortoisecvs, then there are not enough overlay slots available. tortoisesvn tries to be a "good citizen (TM)" and limits its use of overlays to give other apps a chance too.

Now that there are more tortoise clients around und (tortoisecvs, tortoisehg ,...) the icon limit becomes a real problem. to work around this, the tortoisesvn project introduced a common shared icon set, loaded as a DLL, which can be used by all tortoise clients. check with your client provider to see if this has been integrated yet

To obtain the ing between chart overloading and subversion status, or other technical details, read the "icon overloading" section.

Tortoisesvn column in Windows Resource Manager

In the Details View of Windows resource manager, the additional column displays the same information as the icon reload expression (more information can be displayed ).

Simply right click on one of the headings of a column, choose more... from the context menu displayed. A dialog will appear where you can specify the columns and their order, which is displayed in the "detailed view ". scroll down until the entries starting with SVN come into view. check the ones you wowould like to have displayed and close the dialog by pressing OK. the columns will be appended to the right of those currently displayed. you can reorder them by drag and drop, or resize them, so that they fit your needs.

Important

The additional columns in the Windows Explorer are not available on Vista, since Microsoft decided to not allow such columnsAllFiles anymore but only for specific file types.

Prompt

If you want the current layout to be valid for all your working copies, you can set it to the default view.

Local and remote status

Figure 5.13. Check the modifications

It is useful to know which files you have modified and which files have been modified and submitted by another user. This is where the command tortoisesvn → check for modifications... is used. This dialog box shows all the files that have been modified in any form in your work copy, as well as the existing uncontrolled files.

If you click to check the version library, you can also see the changes in the version library. In this way, you can check whether there is a possibility of conflict before submitting. You can also update the selected file from the version library without updating the entire folder.

The dialog box uses the color code to highlight the status.

Blue

Locally modified items

Purple

Added items. The added items have one in the text Status column.+The tooltip shows where the item was copied. Where the item was copied from.

Shen Hong

Deleted or lost items.

Green

There are modified items in both the local and version libraries. Changes will be merged during update. This situationProbablyConflicts occur during updates.

Bright red

Items that have been modified locally but deleted in the version library, or modified in the version Library but deleted locally. This situationYesConflicts occur during updates.

Black

Unmodified and uncontrolled items.

This is the default color scheme, but you can customize these colors by setting the dialog box. For more information, see the tortoisesvn color settings section.

The items that are switched (switched) to different version library paths are also used(s)Mark. When the job is on the branch, you may switch to somewhere and forget to switch back to the trunk. This is your warning signal!

You can view the differences in the context menu of the dialog box. Use context menu → compare with the basic versionYouLocal modification. Use context menu → use standard differential format to display the changes made by others in the differential check version library.

You can also revert changes in individual files. If you have deleted a file accidentally, it will show upMissingAnd you can useRevertTo recover it.

You can use the mail menu → delete files that are not version controlled or ignored and drop them into the garbage bin. If you want to completely delete the object (do not use the recycle bin), PressShiftKey.

If you want to query the details of a file, you can drag it from here to another application, such as a text editor or IDE.

These columns can be customized. If you right-click the header of any column, you will see a context menu that allows you to select which column to display. You can also drag the handle to change the column width when you move the cursor over the column boundary. These customized content will be retained, and you will see the same header next time.

If you do a few unrelated tasks at the same time, you can also modify the group files in the list. Read the modify list section for more information.

At the bottom of the dialog you can see a Summary of the range of repository revisions in use in your working copy. These areCommitRevisions, notUpdateRevisions; they represent the range of revisions where these files were last committed, not the revisions to which they have been updated. note that the revision range shown applies only to the items displayed, not to the entire working copy. if you want to see that information for the whole working copy you must check the show unmodified files checkbox.

Prompt

If you need a full view of the working directory, that is, all files and folders are displayed at the same time, so that you can easily use the check and modify dialog box. You only need to select the actual unmodified file check column to display all the files in the working directory.

Change external name

Sometimes files are not renamed using subversion, so they appear in the file list as files that are lost or not under version control. To avoid loss of history, you must notify subversion. Simply select the old name (lost) and new name (not version controlled), and then use the right-click menu → repair move to indicate that the two files are renamed.

View differences

You usually want to go deep into the file to find out what you have modified. To achieve this goal, you can select this file and select compare from the context menu of tortoisesvn. This operation starts an external difference check program to compare the current file with the original copy after the last check or update (BasicVersion ).

Prompt

Even if you are not working in a work copy or you have multiple versions of files, you can compare them as follows:

Select the two files you want to compare (for example, you can useCTRLAnd then select a comparison from the context menu of tortoisesvn. The last file that is clicked by the mouse (a file with a focus, such as a file with a dotted box with a focus) will be the last one of the files to be compared.