Tweet
PROJECT: Revision Reports
The PROJECT: Altered source files has hit the 500 post limit and actual its name doesn't really reflect its content, instead of altered source files it now contains revision reports.
Here is the start of the PROJECT: Altered source files thread.
And here is the end of the PROJECT: Altered source files thread.
For the first post of this thread I thought I add a small tutorial for TortoiseSVN:
It just contains the basics:
0. Getting TortoiseSVN
1. Checking out the repository
2. Updating your local copy
3. Commiting your changes
4. The log message window
0. Getting TortoiseSVN
You can get TortoiseSVN here for free.
1. Checking out the repository
See the instructions provided at this website:
2. Updating your local copy
Occasionally you may want changes done by others to get incorporated in your local working copy. The process of getting changes from the server to your local copy is known as updating. Updating may be done on single files, a set of selected files, or recursively on entire directory hierarchies. To update, select the files and/or directories you want, right click and select Update in the explorer context menu. A window will pop up displaying the progress of the update as it runs. Changes done by others will be merged into your files, keeping any changes you may have done to the same files. The repository is not affected by an update.
The progress dialog uses colour coding to highlight different update actions
Blue
New item added to your WC.
Dark red
Redundant item deleted from your WC.
Green
Changes from repository successfully merged with your local changes.
Bright red
Changes from repository merged with local changes, resulting in conflicts which you need to resolve.
Black
All other items.
If you get any conflicts during an update (this can happen if others changed the same lines in the same file as you did and those changes don't match) then the dialog shows those conflicts in red. You can double click on these lines to start the external merge tool to resolve the conflicts.
3. Commiting your changes
Sending the changes you made to your working copy is known as committing the changes. But before you commit you have to make sure that your working copy is up to date. You can either make an Update directly. Or you can Check for Modifications first, to see which files have changed locally or on the server.
If your working copy is up to date and there are no conflicts, you are ready to commit your changes. Select any file and/or folders you want to commit and select Commit... from the context menu.
The commit dialog will show you every changed file, including added, deleted and unversioned files. If you don't want a changed file to be committed, just uncheck that file. If you want to include an unversioned file, just check that file to add it to the commit.
The commit dialog has two fields one text field at the top for the Revision comment. And a file list in the middle for the files you have added/modified/deleted.
To fill the revision message you can use the button Paste Changed file names first. This pastes the changed file names into the revision message. Now you can add your descriptions to into that box. Make sure that the first line of your message contains something descriptive as a title of your whole revision or at least the description of your first modification you mention there.
Never leave this first line empty or fill it with a file path, because TortoiseSVN uses the first line of the message as title in the log messages window.
Once this is done you can press the OK button to commit your changes.
If you copy your log message before you press OK you can post it here easily. If you forget this you can still copy it from the Log Messages window.
4. The log message window
You can access it for instance from the TortoiseSVN subcontext menu. You just have to right click on a directory under version controll and you have the three TortoiseSVN options there: SVN: Update, SVN Commit... and TortoiseSVN, use the last option to access the subcontext menu the option Show Log the option Show Log is at the top of the subcontext menu.
The Log Dialog retrieves all those log messages you have to write for each revision and shows them to you. The display is divided into 3 panes.
The top pane shows a list of revisions where changes to the file/folder have been committed. This summary includes the date and time, the person who committed the revision and the start of the log message.
Lines shown in blue indicate that something has been copied to this development line (perhaps from a branch).
The middle pane shows the full log message for the selected revision.
The bottom pane shows a list of all files and folders that were changed as part of the selected revision.
But it does much more than that - it provides context menu commands which you can use to get even more information about the project history.
To shorten this here one important feature of the bottom pane is that you can compare a file with the version of the previous revision, so you can spot all the changes very easily. To do this just right click the file you want to compare and use the Show Differences.
Well this above is only the most important part of the TortoiseSVN help I ripped off and filled with some specific details. If you want to know more then please read the TortoiseSVN help.
-Martin
Here is the start of the PROJECT: Altered source files thread.
And here is the end of the PROJECT: Altered source files thread.
For the first post of this thread I thought I add a small tutorial for TortoiseSVN:
It just contains the basics:
0. Getting TortoiseSVN
1. Checking out the repository
2. Updating your local copy
3. Commiting your changes
4. The log message window
0. Getting TortoiseSVN
You can get TortoiseSVN here for free.
1. Checking out the repository
See the instructions provided at this website:
2. Updating your local copy
Occasionally you may want changes done by others to get incorporated in your local working copy. The process of getting changes from the server to your local copy is known as updating. Updating may be done on single files, a set of selected files, or recursively on entire directory hierarchies. To update, select the files and/or directories you want, right click and select Update in the explorer context menu. A window will pop up displaying the progress of the update as it runs. Changes done by others will be merged into your files, keeping any changes you may have done to the same files. The repository is not affected by an update.
The progress dialog uses colour coding to highlight different update actions
Blue
New item added to your WC.
Dark red
Redundant item deleted from your WC.
Green
Changes from repository successfully merged with your local changes.
Bright red
Changes from repository merged with local changes, resulting in conflicts which you need to resolve.
Black
All other items.
If you get any conflicts during an update (this can happen if others changed the same lines in the same file as you did and those changes don't match) then the dialog shows those conflicts in red. You can double click on these lines to start the external merge tool to resolve the conflicts.
3. Commiting your changes
Sending the changes you made to your working copy is known as committing the changes. But before you commit you have to make sure that your working copy is up to date. You can either make an Update directly. Or you can Check for Modifications first, to see which files have changed locally or on the server.
If your working copy is up to date and there are no conflicts, you are ready to commit your changes. Select any file and/or folders you want to commit and select Commit... from the context menu.
The commit dialog will show you every changed file, including added, deleted and unversioned files. If you don't want a changed file to be committed, just uncheck that file. If you want to include an unversioned file, just check that file to add it to the commit.
The commit dialog has two fields one text field at the top for the Revision comment. And a file list in the middle for the files you have added/modified/deleted.
To fill the revision message you can use the button Paste Changed file names first. This pastes the changed file names into the revision message. Now you can add your descriptions to into that box. Make sure that the first line of your message contains something descriptive as a title of your whole revision or at least the description of your first modification you mention there.
Never leave this first line empty or fill it with a file path, because TortoiseSVN uses the first line of the message as title in the log messages window.
Once this is done you can press the OK button to commit your changes.
If you copy your log message before you press OK you can post it here easily. If you forget this you can still copy it from the Log Messages window.
4. The log message window
You can access it for instance from the TortoiseSVN subcontext menu. You just have to right click on a directory under version controll and you have the three TortoiseSVN options there: SVN: Update, SVN Commit... and TortoiseSVN, use the last option to access the subcontext menu the option Show Log the option Show Log is at the top of the subcontext menu.
The Log Dialog retrieves all those log messages you have to write for each revision and shows them to you. The display is divided into 3 panes.
The top pane shows a list of revisions where changes to the file/folder have been committed. This summary includes the date and time, the person who committed the revision and the start of the log message.
Lines shown in blue indicate that something has been copied to this development line (perhaps from a branch).
The middle pane shows the full log message for the selected revision.
The bottom pane shows a list of all files and folders that were changed as part of the selected revision.
But it does much more than that - it provides context menu commands which you can use to get even more information about the project history.
To shorten this here one important feature of the bottom pane is that you can compare a file with the version of the previous revision, so you can spot all the changes very easily. To do this just right click the file you want to compare and use the Show Differences.
Well this above is only the most important part of the TortoiseSVN help I ripped off and filled with some specific details. If you want to know more then please read the TortoiseSVN help.
-Martin
Comment