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.
1234 ... 11
Topics (378)
Replies Last Post Views
merge two branches by Kamal Ahmed
2
by Kamal Ahmed
Prompting for svn password? by Travis Briggs
0
by Travis Briggs
partial merging by drkzs
5
by Blair Zajac
svnmerge and externals by Ericsson, Lars
10
by Dustin J. Mitchell-2
Missing metainfo when using merge -M or block by steffen (Bugzilla)-3
4
by Blair Zajac
Test suite functional? by mhagger
5
by Blair Zajac
svnmerge.py as library by mhagger
0
by mhagger
Re: svnmerge and "git svn clone"? by mhagger
0
by mhagger
documentation bugs? by arghman
1
by Dustin J. Mitchell-2
svnmerge vs. Subversion 1.6 merge by anatoly techtonik
1
by Blair Zajac
svnmerge and "git svn clone"? by Steinar Bang
0
by Steinar Bang
Problem with merges from the root of a repository by Jeppe_Oland
2
by Jeppe_Oland
Merge Issues by Prakash P M S
13
by Prakash P M S
Issue with the SvnMerge Windows Gui tool. by Suram, Ravi Rajanya
0
by Suram, Ravi Rajanya
--ignore-ancestry by James Sleeman
0
by James Sleeman
moving trunk and a branch? by Hernan Martinez-Foff...
1
by Dustin J. Mitchell-2
Issue 3494: moving a branch stumps svnmerge by David Brooks-6
0
by David Brooks-6
Preserving merge history when moving servers? by Steinar Bang
9
by Blair Zajac
question about using svnmerge after manually merging for a while by Chris Hall-2
2
by Raman Gupta
Unicode in log messages by bimargulies
16
by Raman Gupta
svnmerge.py init crashes (on bad characters in svn xml log) by Jean-Philippe Daigle...
8
by Jean-Philippe Daigle...
Problems with svnmerge-migrate-history.py by Sarah Fernandezlopez
1
by Dustin J. Mitchell-3
bug when trying to block/merge revision w/ encoded text that the terminal's locale cannot support by Brett Cannon-2
5
by Jon Schewe
patch: ignore corrupt entries by Benjamin Reed-3
4
by Dustin J. Mitchell-3
Detailed information about changes in svnmerge-commit-message.txt by Marcin ZajÄ…czkowski
8
by Dustin J. Mitchell-3
Better way to convert merge-tracking information into svn native format? by Oefelein, Martina
0
by Oefelein, Martina
Status of 'merge helper script'? by Bob Sandiford
0
by Bob Sandiford
Subversion 1.6 merge issue: use of authz by Sunil Gandhi
0
by Sunil Gandhi
Removing block checkins from avail list? by Steinar Bang
1
by Steinar Bang
Problems with latest stable svnmerge.py on RHEL4 by Steinar Bang
11
by Dustin J. Mitchell-3
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
1234 ... 11