Parent Categories/Forums: Subversion
Edit this Forum

Svnmerge.py

Search:
This forum is an archive for the mailing list: svnmerge@orcaware.com (mailing list 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.
Child Forums (0): None
To migrate this forum to the new Nabble2 system, please post a request in the Nabble Support forum — Learn more
Post to Svnmerge.py Post New Message  ::  Alert me of new posts  ::  Rating Filter:
« Newest  ‹ Newer  —  Threads 1-35  —  Older

Thread (359 Threads) Rating Replies Last Message

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 Zaja;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

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
Post to Svnmerge.py Post New Message  ::  Alert me of new posts  ::  Atom feed for Svnmerge.py
« Newest  ‹ Newer  —  Threads 1-35  —  Older