leetore.blogg.se

Diffmerge sourcegear
Diffmerge sourcegear













diffmerge sourcegear
  1. #DIFFMERGE SOURCEGEAR 64 BIT#
  2. #DIFFMERGE SOURCEGEAR FULL#

You would release the lock an object because you've decided not to commit your changes and want to release the object for other developers to work with. Note that Subversion supports "breaking" and "stealing" locks, so it's still possible that another developer could make changes to an object after you've locked it. Those do what you would expect, allow you to lock an object to discourage other developers from making changes to it while you're making your changes. The first two new items are "SVN Lock" and "SVN Release Lock". We see several new options: SVN Lock/Release Lock If you click on a non-modifed object, you'll see the following: Now let's look at the popup menu in the PowerBuilder IDE.

#DIFFMERGE SOURCEGEAR 64 BIT#

Since I'm using a 64 bit OS machine for the demo, I'm using the 64 bit version of TortoiseSvn, and PowerBuilder is calling it fine.

diffmerge sourcegear

Finally, for both these options (Diff and Show Log) the bitness of the application doesn't matter. The one you want is the TortoiseSvnProc.exe file. You won't want the ones with "Diff" in their names, although that seems logical. Note that there are a lot of executables in the TortoiseSVN bin directory. There's no option here, TortoiseSVN is the only choice. The second option (Show Log) is where you specify the location of the TortoiseSVN executable so that it can be used to when you select the Show Log option in the PowerBuilder menu. What I'll be using for this demo though is SourceGear's DiffMerge. SemanticMerge (which I recommended in the prior blog) is listed as well. A large number of different tools are supported out of the box, and there's an Other option if your tool of choice isn't shown. The first (Diff Viewer) allows you to select the program that will be used to perform diffs when you select that option in the PowerBuilder menu. In order for a couple of the new features to work we're going to need to go to the workspace properties, the Source Control tab and hit an "Advanced" button that's been added in this release. Workspace Source Control Advanced Properties

#DIFFMERGE SOURCEGEAR FULL#

That has been addressed in R3 as well, as you can now supply the full URL for the remote repository. There was a similar limitation in R2 for the dialog for Connect To Workspace. Now when you do the initial connect to source control you simply provide the full repository URL we copied earlier. You then provided PowerBuilder with base URL for the SVN server and PowerBuilder constructed the repository URL by appending the workspace name to the base URL for the server. In R2, PowerBuilder forced you to create a remote repository that matched the workspace name.

diffmerge sourcegear

In this blog post we're going to look at the enhancements that were added to that feature in 2017 R3. Support for using SVN as a source control system without going through a bridge product was added in 2017 R2 and covered in a previous blog post.















Diffmerge sourcegear