global conflict trial software / shareware for mac

Syncro SVN Client 5.0 provides you with a very convenient and useful tool which makes easier the document and code sharing between content authors or developers. It offers full SVN repository support: checkout, export, import, copy, mkdir, rename, branch, tag and delete.

You can browse repositories, check for changes, commit changes, update your working copy and examine the revision history. There is no need to install separate applications like a Subversion command line client or a file compare tool.

Major Features:

1. Subversion(SVN) 1.6
   • Full SVN repository support (checkout, import, export, copy, mkdir, rename, branch, tag, delete, etc..) for SVN 1.3, 1.4, 1.5 and 1.6.
2. SVN Resource History
   • Examine the history for a selected resource and find out what happened at a certain revision.
3. Resolving Conflicts
   • Quickly resolve conflicts by merging the files visually using the built-in 3-way compare editor.
4. Revision Graph
   • The history of a SVN resource can be viewed as a graph in the form of a tree, enhanced with log messages.
5. Bug Tracking
   • You can associate the changes you make with a specific issue from the bug tracking system.
6. Check Differences
   • Easily synchronize the changes from your working copy against the ones from the repository. Use the built-in diff tool or any other tool.
7. Detailed Author Info
   • You can inspect the author, revision number and log message for each line from a versioned file.
8. Directory Change Set
   • The Directory Change Set view presents the set of changes in a tree format.
9. Flexible Layout
   • All views are dockable, meaning that you can move them to create the optimal layout for your use case
     

Enhancements:

• Support for SVN 1.6
• • Syncro SVN Client supports SVN 1.6.2, allowing users to take advantage of the latest SVN improvements and fixes. Previous SVN versions are also supported, the user being able to decide whether a working copy should be updated to version 1.6 or not.
• Tree conflicts handling
• • Subversion 1.6 recognizes a new kind of conflict, known as a "tree conflict". Such conflicts manifest at the level of directory structure, rather than file content. These conflicts include deletions of locally modified files and incoming edits to locally deleted files. Syncro SVN Client allows to handle these conflicts offering a dialog that lists possible solutions for solving these conflicts.
• Improvements to svn:externals
• • Subversion 1.6 allows to link to external files by putting their URLs in the svn:externals property on the parent folder. Syncro SVN Client allows you to create, update, commit and remove external links from the user interface changing automatically the svn:externals property as needed.
• Improved revision graph performance
• • Syncro SVN Client stores the result of a revision graph operation and reuses that for further operations on the same repository, thus avoiding unnecessary requests to the SVN server for the same data. This results in a noticeable increase in performance.
• Access to network SVN file repositories
• • Network SVN repositories can be accessed using file URLs of the form "file://server/path".
• Better handling of symbolic links
• • Syncro SVN Client analyses the structure created by symbolic links usage detecting and handling infinite recursions.

Requirements:

• Minimum hardware configuration is PowerPC G4 class system with 128 MB of RAM and 200 MB free disk space.
• Syncro SVN Client may work very well with JVM implementations from other vendors but the eventual incompatibilities will not be solved in further Syncro SVN Client releases