Svnmerge.py

This forum is an archive for the mailing list svnmerge@orcaware.com (more options) Messages posted here will be sent to this mailing list.
A mailing list for use and development of the svnmerge.py tool -- an add-on tool for Subversion.

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 displaying an always updated list of changes yet to be merged, and totally prevents merge mistakes (such as merging the same change twice).

You can think of svnmerge as the equivalent of yellow sticky notes on a Subversion branch that record which revisions have been merged in already from one or more other branches, plus some useful functionality for viewing, managing and updating that information.
12345 ... 11
Topics (383)
Replies Last Post Views
svn 1.6.1 & svnmerge.py by Jon Schewe
1
by Jon Schewe
Re: [Issue 3406] svnmerge fails when encountering ssh warning by ken railey-2
0
by ken railey-2
Merging to another repository by dawez
0
by dawez
transitive merging trickiness problem by Ted Stern-2
1
by Jon Schewe
What pitfalls do I need to know about if my branch is not "recently-created"? by Clayton Scott
0
by Clayton Scott
2.3 compat by Noah Kantrowitz-3
1
by Giovanni Bajo
python modularity by Ted Stern-2
4
by Giovanni Bajo
bidirectional merges by Ted Stern-2
2
by Blair Zajac
problem with non-interactive by Jon Schewe
6
by Eric Engstrom
Problem with svnmerge.py init (constantly asks for password) by Robert Kern-6
1
by Dustin J. Mitchell-3
updates for python 2.6? by Jon Schewe
4
by Dustin J. Mitchell-3
Merging two branches by Eduardo Wenzel Brião
0
by Eduardo Wenzel Brião
Unexpected conflicts by Jon Schewe
2
by Jon Schewe
resolved Re. Transitive merging ( A -> B -> C) doesn't merge file contents? by Mark Kempster
0
by Mark Kempster
resolved Re. Transitive merging ( A -> B -> C) doesn't merge file contents? by Mark Kempster
0
by Mark Kempster
Transitive merging ( A -> B -> C) doesn't merge file contents? by Mark Kempster
0
by Mark Kempster
Problem with added files by Jon Schewe
3
by Nolan R
Error in svnmerge by Jon Schewe
1
by Dustin J. Mitchell-3
[Issue 2869] multiple pathid formats by Dustin J. Mitchell-3
10
by Blair Zajac
Merging two branches by jordiang
3
by Romulo A. Ceccon
svnmerge & foreign repositories by Eric Engstrom
6
by Dustin J. Mitchell-3
svnmerge.py with Subversion 1.5 by jordiang
2
by Dustin J. Mitchell-3
Problem with multiple groups of revisions to merge by Jon Schewe
2
by Jon Schewe
odd error from svnmerge by Jon Schewe
0
by Jon Schewe
setting up new development branch by Jon Schewe
4
by Blair Zajac
Svnmerge.py and Subversion 1.5 by Erik Andersson-3
6
by Hermanns, Horst-2
Re: Error during "svnmerge.py init" by Rick Berge
1
by Dustin J. Mitchell-3
svnmergeGUI Release for svn 1.5 clients by qnob
0
by qnob
Question about SVN 1.5 vs. svnmerge by Jon Schewe
7
by Reid Priedhorsky
Problem init'ing a branch of a branch by Buddy Burden-3
4
by James Sleeman
truMerge, a tree-conflict aware merge helper tool by Schellingerhout, Nic...
0
by Schellingerhout, Nic...
Tracking properties by Noah Kantrowitz-3
0
by Noah Kantrowitz-3
Running svnmerge in a subprocess by Simon Brunning-2
5
by Dustin J. Mitchell-3
Property conflicts using 1.5-Client with svnmerge by Hermanns, Horst-2
0
by Hermanns, Horst-2
svnmerge.py and tags by JL-16
2
by Henrik B Johansson
12345 ... 11