Svnmerge.py: Difference between revisions
Jump to navigation
Jump to search
Giovannibajo (talk | contribs) (add windows download link) |
Giovannibajo (talk | contribs) (Refactor using tables) |
||
| Line 10: | Line 10: | ||
== Downloads == | == Downloads == | ||
svnmerge.py is | {| border="1" cellpadding="2" style="width:75%" | ||
!width="30%"|Link | |||
!Description | |||
|- | |||
|[http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge.py svnmerge.py trunk version] || This is the default development version, which is usually very stable. Get it without worrying too much! | |||
|- | |||
|[http://svn.collab.net/repos/svn/branches/1.4.x/contrib/client-side/svnmerge.py svnmerge.py 1.4-branch version] | |||
|| This is the version shipped with SVN 1.4. It's less updated than the trunk version so it will usually have less features but maybe be a little more stable. Get this if the current trunk version is temporarily broken. | |||
|- | |||
|[http://www.develer.com/~rasky/svnmerge.exe svnmerge.exe Windows executable] || Self-contained Windows executable, does not require a Python installation (but still requires SVN command line client). This is updated every once in a while, use <tt>--version</tt> to compare it with the trunk version. | |||
|} | |||
There is not a proper | svnmerge.py is maintained within the Subversion repository. There is not a proper release plan or development map, so there are no official releases. svnmerge.py gets shipped with Subversion mostly 'the way it is' when Subversion itself is shipped. Thus, the trunk version is recommended: we believe it to be mostly stable (there is a quite extensive testsuite). | ||
Revision as of 11:34, 30 May 2006
svnmerge.py is a tool for automatic branch management. It allows branch maintainers to merge changes from and to their branch very easily, and automatically records which changes were already merged; this allows to display an always updated list of changes yet to be merged, and totally prevehents merge mistakes (such as merging the same change twice). See our feature list for a more detailed description.
System requirements
System requirements are down to a bare minimum, to lower as much as possible the bar for using the tool. Currently, you need:
- SVN command line client, version 1.1 or later.
It might actually work with an older version but it has never been tested. Notice that the command line client is required: so, noticeably, if you use TortoiseSVN, you need to go install the official SVN distribution to use svnmerge.py (and no, this causes no conflicts whatsoever!) - Python 2.0 or later.
This is used to run svnmerge.py directly from its source; another option is to download the binary Windows distribution (svnmerge.exe) which does not require an existing Python installation.
Downloads
| Link | Description |
|---|---|
| svnmerge.py trunk version | This is the default development version, which is usually very stable. Get it without worrying too much! |
| svnmerge.py 1.4-branch version | This is the version shipped with SVN 1.4. It's less updated than the trunk version so it will usually have less features but maybe be a little more stable. Get this if the current trunk version is temporarily broken. |
| svnmerge.exe Windows executable | Self-contained Windows executable, does not require a Python installation (but still requires SVN command line client). This is updated every once in a while, use --version to compare it with the trunk version. |
svnmerge.py is maintained within the Subversion repository. There is not a proper release plan or development map, so there are no official releases. svnmerge.py gets shipped with Subversion mostly 'the way it is' when Subversion itself is shipped. Thus, the trunk version is recommended: we believe it to be mostly stable (there is a quite extensive testsuite).