The easiest way to do this is to use the Git Bash command-line tool. The next step is to configure Git to use P4Merge as the default Diff and Merge tool. The P4Merge software should now be installed and ready to use. Installation completed dialog box.Ĭlick on the Finish button to exit from the installer. When the software has finished installing, the following dialog box will be displayed: Figure 7. The installation status dialog box will appear. Ready to Install dialog box.Ĭlick on the Start button to begin the installation process. Since we don’t have a Perforce Server, it doesn’t matter what value we use here, so just click the OK button to accept the default. If you prefer to use a different text editor, just navigate to its folder and select its executable file instead. When you’re done, the installer dialog box should look like the picture above. Select the notepad .exe application file. Client configuration dialog.Ĭlick on the Browse button and navigate to the Notepad folder. The Client Configuration dialog will be displayed. P4Merge installer with components selected.Ĭlick on the next button. The installer window will look like this when you’re done: Figure 2. Click on the dropdown boxes for Visual Client and Administration Tool and deselect them. The P4Merge installer start page.įor our purposes, we only want to install the Visual Merge Tool and Command-Line Client components. When the installer finishes starting up, the following screen will appear: Figure 1. Installing Perforce P4MergeĬopy the P4Merge installer file from the M: drive location to your TCN virtual machine. If you have any questions, let me know and we'll find the answers together and update this Wiki page so everyone can benefit. gitignore file to start the tool automatically, and instructions for using the tool. This Wiki page contains instructions for installing P4Merge, configuring your. In the meantime, I recommend that you install and use P4Merge to get familiar with the way these kinds of tools work and how to use them. Once we get the new virtual machine with Windows 7 in it, I think we'll have a larger selection of free tools to choose from. I looked at several tools available for free and it looks like the best of the lot is P4Merge from Perforce Software. My favorite tool in this category is Beyond Compare, but it costs money and I realize that not everyone wants to spend their hard-earned cash on software development tools. But for viewing differences between objects (files, commits, branches) or performing a three-way merge, I prefer a visual tool. (Reloading the client was not necessary for me - the bookmarks showed up right away.I prefer to use the command line for most of the things I do in Git. It will give you the xxxx number and the directory where you can find (source) and then overwrite (target) the existing bookmarks.xml. Look in connectionmap.xml in C:\Users\loginname\.p4qt and search for you user name. Solution 2Ĭraig is correct, but here's a way to find the right xxxxClients directory both on the source and the target computer (you might very well have several of them on the target computer as well). Once you find the right one, transfer it to the new computer which is likely to only have one of these directories and the bookmarks will appear after reloading the client. If you only have one directory called '0001Clients' you're in luck, but you may have more than one of these directories so it may require searching for the right bookmarks.xml file. P4V does not have an easy method for transferring bookmarks, however bookmarks are stored in bookmarks.xml found in a directory: C:\Users\loginname\.p4qt\nnnnClients\ To find the name of the new computer select 'create a new workspace' from Connection menu and note the name of the 'host' field and then cancel the menu. After doing this, the 'switch to workspace' option will appear on the context menu. Right click on the desired workspace and select 'edit workspace' and change the host field (in advanced tab) to the name of the new computer, or clear the host field. To do this, click the 'workspace' icon (picture of a terminal screen), click the cancel filter icon to view all workspaces (top right of the panel, a cross over a funnel). copy all the data from the old root to the same directory on the new computer, assuming you wish to use the same root path, orĭoing this ensures the workspace is in sync with the server.Changing the host field to blank or more preferably the name of the new computer will allow it to be used on the new computer, however you must also either: The 'host' field in the workspace limits its use to that computer.
0 Comments
Leave a Reply. |