Hello, I've noticed that Matt was using svnmerge.py [1] for porting the trunk changes to his sqlalchemy branch. That looks like a good idea, so I'd like to propose to use that on a bigger scale. As I've recently manually checked what was ported from trunk to 0.10-stable, I've started to use it there also [2].
Admittedly, the way Trac shows the svnmerge-* properties could be improved, but there's a already a ticket for that ;) [3] Quick guide: ============ 1) Download the script http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge.py Create some alias to the script, e.g. svnmerge() { python ~/scripts/svnmerge.py "$@"; } 2) To check what's left to merge on stable cd branches/0.10-stable svnmerge avail --log # decide what should *not* go on stable svnmerge block -r... # decide what should be merged svnmerge merge -r... svn commit -m "Ported ... to 0.10 stable (''short summary'')" (I suggest that we keep a concise commit message like the above, instead of the more verbose one automatically generated by the script) IMPORTANT NOTE: About revision intervals: ========================================= When you do a `svn merge`, you're used to specify ranges like -rX:Y, where - X is the base for the diff - Y is the last revision to be used to build the diff That's also what we write in the logs, like [X:Y], because that way, it's easy to see the corresponding diff. Note that the changeset X itself was *not* merged, it was only used for the base. Revision intervals in svnmerge.py are really intervals of the changesets that will get merged, so in the above example, X+1:Y. -- Christian [1] - http://www.orcaware.com/svn/wiki/Svnmerge.py [2] - http://trac.edgewall.org/log/?rev=3910&stop_rev=3907 [3] - http://trac.edgewall.org/ticket/1601 --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Trac Development" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/trac-dev -~----------~----~----~----~------~----~------~--~---
