When you are ready to commit your changes it's a simple matter of clicking the "Commit" button from within the pending changes window.Ĭreating a new branch is made simple in Ankh. Solution explorer will also reflect pending changes by decorating changed files with a red square icon. At any time you can open up the "pending changes" window to see what files are waiting to be committed. You can also update individual projects and/or directories by right-clicking them.Īs you modify files in your solution Ankh automatically keeps track of these changes. To update the entire solution you would right-click the solution node and select "Update Solution to Latest Version". You are also able to start an update by right-clicking in solution explorer. The easiest way to get updates from the repository is to use the "Update" button from within the pending changes window.Īfter clicking "Update" you will see a dialog pop up and list the files being updated. You will notice in solution explorer that your items now have green check marks next to them. When it finishes mapping your local directory it will then open up the locally mapped solution. I am mapping the CodeTunnel project to a new directory called "CodeTunnel".Īs Ankh pulls down your branch you will see a window showing a scrolling list of files being downloaded. Modify "Local Directory" to the location you desire. You will see a window allowing you to decide what local folder to map your branch to. Select the solution file and click "Open". Once the repository has loaded, navigate to the branch you want to open and find the solution file. Click the little blue world with the yellow plus sign above it to add a repository URL. You will be presented with a dialog allowing you to navigate to a repository URL. You can accomplish both by navigating to File > Open > Subversion Project. One convenient feature of AnkhSVN is that it provides a smooth transition between "mapping" an SVN branch and "opening" a Visual Studio solution. Mapping an Existing Branch / Opening a Project From SVN Beyond Compare 3 will now be used for comparisons and conflict resolution. I use 2-Way, but the nice thing about that is if you do have Beyond Compare Pro then you get a 2-Way view plus an Output window toward the bottom.Ĭlick OK to save your changes. However, I personally do not like the 3-Way merge I feel like it over-complicates things. You can only do 3-Way if you have Beyond Compare Pro. Also note that "Exernal Merge Tool" has two Beyond Compare options: "Beyond Compare (2-Way)" and "Beyond Compare (3-Way)". Note: If you have TortoiseSVN installed then "External Patch Tool" will be set to TortoiseMerge that is fine. Leave "External Patch Tool" set to default. Set "External Merge Tool" to "Beyond Compare (2-Way)". Set "External Diff Tool" to "Beyond Compare". Go to Source Control > Subversion User Tools. You don't have to paste any command line arguments like you do with TortoiseSVN. Setting up Beyond Compare with Ankh is easy. Don't believe me that you should get it? Fine, stick with TortoiseMerge. If you don't have Beyond Compare, GET IT NOW!. This section will show you how to make Ankh use Beyond Compare for merges and comparisons. Note: I love Beyond Compare and you should too. If you do not see it ensure it has been installed correctly. In the drop down list you should see AnkhSVN as an option. In the left pane, navigate to Source Control > Plug-in Selection. Open up Visual Studio and navigate to Tools > Options to open the options window. Setup Visual Studio Source Control Plugin Mapping an Existing Branch / Opening a Project From SVN.The express editions of Visual Studio do not support plugins. Note: If you want to use AnkhSVN you will need a paid version of Visual Studio 2010. If you've used Microsoft's Team Foundation Server before then the Ankh plugin will seem familiar. The benefit of using Ankh is the built-in solution explorer support and pending changes window. While TortoiseSVN is great, I really enjoy using a plugin for Visual Studio called AnkhSVN. I recently finished a TortoiseSVN Basics Tutorial.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |