This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
sd:svn-tutorial [2014/01/17 22:32] filip.jonckers |
sd:svn-tutorial [2018/02/20 10:39] (current) jessy.stas [Committing your changes to the repository] |
||
|---|---|---|---|
| Line 14: | Line 14: | ||
| For example, the IVAC2 FIRDEF repository URL can be: | For example, the IVAC2 FIRDEF repository URL can be: | ||
| - | * complete project (trunk): https://dp-svn.sd.ivao.aero/ivac/trunk | + | * complete project (trunk): https://svn.terminal2solutions.com/ivac/trunk |
| - | * the EBBU FIRDEF: https://dp-svn.sd.ivao.aero/ivac/trunk/fir/ebbu | + | * the EBBU FIRDEF: https://svn.terminal2solutions.com/ivac/trunk/fir/ebbu |
| - | * the tools: https://dp-svn.sd.ivao.aero/ivac/trunk/tools | + | * the tools: https://svn.terminal2solutions.com/ivac/trunk/tools |
| Depending on your team, you have read or read/write access to specific parts of the repository tree. | Depending on your team, you have read or read/write access to specific parts of the repository tree. | ||
| Line 27: | Line 27: | ||
| * Select a directory in windows explorer where you want to place your working copy | * Select a directory in windows explorer where you want to place your working copy | ||
| - | * **Right click** to pop up the context menu and select the command **TortoiseSVN** | + | * **Right click** to open the directory context menu |
| - | * the //TortoiseSVN// submenu will appear: | + | |
| - | {{http://tortoisesvn.net/docs/release/TortoiseSVN_en/images/ExplorerFileMenuFileShortcut.png}} | + | {{ :sd:svn_checkout.png?nolink |}} |
| - | * select the command **Checkout...** | + | * select the command **SVN Checkout...** |
| * the //checkout// dialog will appear: | * the //checkout// dialog will appear: | ||
| - | {{http://tortoisesvn.net/docs/release/TortoiseSVN_en/images/Checkout.png}} | + | {{:ivac2:picture646.png?nolink|}} |
| * **URL of repository**: fill in the URL of the repository you want to checkout | * **URL of repository**: fill in the URL of the repository you want to checkout | ||
| Line 42: | Line 41: | ||
| * **Revision**: HEAD | * **Revision**: HEAD | ||
| * press the **OK** button to proceed | * press the **OK** button to proceed | ||
| - | * you will get a popup window asking to approve a certificate (https) - approve the certificate | + | * //( you will get a popup window asking to approve a certificate (https) - approve the certificate )// |
| * you should see now that files are downloaded into the working copy directory | * you should see now that files are downloaded into the working copy directory | ||
| Line 50: | Line 49: | ||
| Periodically, you should ensure that changes done by others 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: | Periodically, you should ensure that changes done by others 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 to update (or the root folder of your working copy) | + | * select the root folder of your working copy (or .. select the files and/or directories you want to update) |
| - | * **Right click** to pop up the context menu and select the command **TortoiseSVN** | + | * **Right click** to open the file context menu |
| - | * select the command **Update...** | + | |
| - | {{http://tortoisesvn.net/docs/release/TortoiseSVN_en/images/UpdateFinished.png}} | + | {{ :sd:svn_explorer_menu.png?nolink |}} |
| + | |||
| + | * select the command **SVN Update...** | ||
| + | |||
| + | {{:ivac2:picture647.png?nolink|}} | ||
| When the update is complete, the progress dialog shows a summary of the number of items updated, added, removed, conflicted, etc. below the file list. This summary information can be copied to the clipboard using Ctrl+C. | When the update is complete, the progress dialog shows a summary of the number of items updated, added, removed, conflicted, etc. below the file list. This summary information can be copied to the clipboard using Ctrl+C. | ||
| Line 83: | Line 85: | ||
| To update your working copy to the latest version: | To update your working copy to the latest version: | ||
| - | * **Right click** to pop up the context menu and select the command **TortoiseSVN** | + | * **Right click** to open the file context menu |
| - | * select the command **Update...** | + | |
| + | {{ :sd:svn_explorer_menu.png?nolink |}} | ||
| + | |||
| + | * select the command **SVN Update...** | ||
| + | |||
| + | {{ :sd:svn_update_finished.png?nolink |}} | ||
| + | |||
| To see which files have changed locally or on the server: | To see which files have changed locally or on the server: | ||
| * **Right click** to pop up the context menu and select the command **TortoiseSVN** | * **Right click** to pop up the context menu and select the command **TortoiseSVN** | ||
| + | |||
| + | {{ :sd:svn_tortoisesvn.png?nolink |}} | ||
| + | |||
| * select the command **Check for Modifications...** | * select the command **Check for Modifications...** | ||
| + | |||
| + | {{ :sd:svn_checkmods.png?nolink |}} | ||
| + | |||
| If your working copy is up to date and there are no conflicts, you are ready to commit your changes: | 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 -- or the root folder of the local working copy | + | * Select the root folder of the local working copy ( or .. any file and/or folders you want to commit) |
| - | * **Right click** to pop up the context menu and select the command **TortoiseSVN** | + | * **Right click** to pop up the file context menu |
| - | * select the command **Commit...** | + | |
| + | {{ :sd:svn_commit.png?nolink |}} | ||
| + | |||
| + | * select the command **SVN Commit...** | ||
| - | {{http://tortoisesvn.net/docs/release/TortoiseSVN_en/images/Commit.png}} | + | {{ :sd:svn_commit_dialog.png?nolink |}} |
| 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 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. | ||
| Be sure to enter a log message which describes the changes you are committing. This will help you and other team members to see what happened and when, as you browse through the project log messages at a later date. The message can be as long or as brief as you like; | Be sure to enter a log message which describes the changes you are committing. This will help you and other team members to see what happened and when, as you browse through the project log messages at a later date. The message can be as long or as brief as you like; | ||
| - | +note+: we strongly recommend that you use english - please remember that not only you but also we - the SoftDev Team - must be able to understand the work you have done. | + | |
| + | **note:** we strongly recommend that you use English - please remember that not only you but also we - Terminal2 Solutions - must be able to understand the work you have done. | ||
| Line 115: | Line 134: | ||
| If you want to add new files to the _repository_ do the following: | If you want to add new files to the _repository_ do the following: | ||
| * Select any file and/or folders you want to add to the //repository// | * Select any file and/or folders you want to add to the //repository// | ||
| - | * **Right click** to pop up the context menu and select the command **TortoiseSVN** | + | * **Right click** to pop up the file context menu and select the command **TortoiseSVN** |
| + | |||
| + | {{ :sd:svn_tortoisesvn.png?nolink |}} | ||
| * select the command **Add...** | * select the command **Add...** | ||
| + | |||
| + | {{ :sd:svn_explorer_add.png?nolink |}} | ||
| + | |||
| + | |||
| Line 136: | Line 162: | ||
| * **Right click** to pop up the context menu and select the command **TortoiseSVN** | * **Right click** to pop up the context menu and select the command **TortoiseSVN** | ||
| * select the command **Add...** | * select the command **Add...** | ||
| + | |||
| + | {{ :sd:svn_explorer_add.png?nolink |}} | ||
| + | |||
| + | |||
| **__note__** | **__note__** | ||
| Line 148: | Line 178: | ||
| * Select a directory in windows explorer where you want to place your working copy | * Select a directory in windows explorer where you want to place your working copy | ||
| - | * **Right click** to pop up the context menu and select the command **TortoiseSVN** | + | * **Right click** to pop up the file context menu |
| - | * select the command **Checkout...** | + | |
| + | {{ :sd:svn_checkout.png?nolink |}} | ||
| + | |||
| + | * select the command **SVN Checkout...** | ||
| * the //checkout// dialog will appear: | * the //checkout// dialog will appear: | ||
| - | {{http://tortoisesvn.net/docs/release/TortoiseSVN_en/images/Checkout.png}} | + | {{ :sd:svn_checkout_dialog.png?nolink |}} |
| * **URL of repository**: fill in the URL of the SVN repository | * **URL of repository**: fill in the URL of the SVN repository | ||
| Line 207: | Line 240: | ||
| If you have conflicts with binary files, Subversion does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version. | If you have conflicts with binary files, Subversion does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version. | ||
| + | |||
| + | ---- | ||
| + | |||
| + | [[sd:subversion|Back to Subversion]] / [[index:|Back to Index]] | ||