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

Thread (317 Threads) Rating Replies Last Message

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

Spurious property conflicts by Henrik B Johansson
0
by Henrik B Johansson

deleted files not really deleted? by Nolan R
0
by Nolan R

Renames/Moves followed by merge by rjk1408
1
by Nico Schellingerhout

Compatibility of svnmerge with 1.5 clients but 1.4 server? by Paul Walmsley-3
2
by rjk1408

Bindirectional Merges, simple question by qnob
1
by Blair Zajac

KeyError with svnmerge.py init by Buddy Burden-3
5
by Dustin J. Mitchell-3

Experiences with svn/svnmerge; supporting tools around svn/svnmerge by Hermanns, Horst-2
6
by Nico Schellingerhout

[PATCH] allow the use of the avail command against a URL by Shaddy Baddah-2
5
by Shaddy Baddah-2

[PATCH] fix source pathid selection by Shaddy Baddah-2
1
by Dustin J. Mitchell-3

overzealous exclusion of reflective merges? by Reid Priedhorsky-2
8
by Reid Priedhorsky

Merging From Multiple Branches by David A. Greene
0
by David A. Greene

Problem with init by Number8
0
by Number8

Re: Experiences with svn/svnmerge; supporting tools around svn/svnmerge by Piet-Hein Peeters
1
by Hermanns, Horst-2

Should we be using the trunk version of svnmerge for svn 1.4.x? by Paul Walmsley-3
0
by Paul Walmsley-3

merging from branch to trunk and then to branch by JL-16
15
by JL-16

Adding option --config-dir by Nicolas PAYART
1
by Dustin J. Mitchell-3

Re: svnmerge.py + merge tracking by Blair Zajac
2
by Blair Zajac

Automating merge tracking initialization by rjk1408
9
by Blair Zajac

Excluding "initialized revisions" by John Ricklefs
2
by Dustin J. Mitchell-3

[PATCH] fix failing test by Dustin J. Mitchell-3
0
by Dustin J. Mitchell-3

[patch] fix get_svninfo parsing -- ":", not ": " by Daniel Colascione
3
by Dustin J. Mitchell-3

Initialization problem by Wayne J
11
by Raman Gupta

Re: Bug in svnmerge.py, rev 30107 (not fully compatible with Python 2.2.x) by Raman Gupta
2
by Raman Gupta

Directory conflicts, unicode values in array self.revs by Hermanns, Horst-2
9
by Giovanni Bajo

Fwd: Bug in svnmerge.py, rev 30107 (not fully compatible with Python 2.2.x) by Blair Zajac
0
by Blair Zajac

Multiple conflicting revisions of one file in a merge by John Ricklefs
4
by Raman Gupta

Trac friendly log messages by Adam Nelson
0
by Adam Nelson

definitions of the following? by Nolan R
0
by Nolan R

Trouble understanding why there is nothing to merge by Margo K
1
by Nolan R

Some un-clarity in the wiki tutorial [attn: Giovanni Bajo] by David Abrahams
3
by Paul Walmsley-3

Graphical view of branch / merge history by Laurent PETIT
3
by Paul Walmsley-3
Post to Svnmerge.py Post New Message  ::  Alert me of new posts  ::  Atom feed for Svnmerge.py
« Newest  ‹ Newer  —  Threads 1-35  —  Older