Projects tagged ‘merge’ and ‘subversion’

A merge tool make TortoiseSVN resolve conflict like TortoiseCVS.

This is a program aim to help merge branch control in subversion system. Subversion is wonderfull version control system, but merge branch can be a big headache. Specially if you haven't been using ... [More] comments or always have forggeten put comments to mark your revisions branchs. If you use this program all comments for revisions branchs will be put in a standard way, so the program can detect which range of revisions branchs need to merge. [Less]

Features: Draws a graph of all revisions of the current Vcs controlled file Supports both CVS and Subversion The graph can be zoomed in and out to better manage large revision graph history Not all ... [More] Vcs implementations support merge history so if you follow a convention of adding "Merge From: " and "Revision: " in your commit message when you check in a merged file, the revision graph will draw red merge arrows showing the merge graphically Usage: Right click editor and choose Revision Graph... from within the Vcs menu CVSOffers the ability to add and remove tags to specific revisions in the graph regardless of what is in the sandbox CVSProvides simple management of merge tags based on a configurable merge tag naming convention Allows retrieval of any selected revision into your current working copy [Less]

oi checks for needed integrations/merges between codelines and notifies of the integration needs. It is useful for automatic notification of needed integrations to keep codelines synced in concurrent ... [More] development. For example, it can check for outstanding integrations between a release codeline and the main line (trunk), and email them to a defined address list. It answers the question "are all the changes made to a release codeline merged to the main codeline?" For another example, oi helps keep project/work codelines up to date with ongoing changes to the main or next release codelines. oi is an integration/merge "babysitter". Just like a CI (Continuous Integration) product babysits the build, ensuring the build succeeds and tests pass, oi ensures the integrations are done (either integrated or cleared). This is important for a concurrent development environment. [Less]

SCM Patrol comes with usefull functions to help you to deal with the complexity of modern scm tools. A short list of this functions is : commit alert commit detection following life of project ... [More] detecting merge between different branches workflow around commit and a lot more [Less]