[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Turning a merge graph into svn commands

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 30 May 2012 21:35:41 +0100 (BST)

Just a toy a the moment, but the attached patch makes 'tools/dev/merge-graph.py' output a sequence of 'svn' commands that executes the branching and merging shown in the graph (as well as writing an image file). Example (where merge-sync-1-req.txt is one of the attachments to <http://wiki.apache.org/subversion/SymmetricMerge>): $ merge-graph.py merge-sync-1-req.txt merge-graph.py: reading 'merge-sync-1-req.txt', writing 'merge-sync-1-req.png' # start r1 svn mkdir O O/created_in_O svn mkdir O/new_in_O0 svn commit -m r1 # start r2 svn copy -r1 O A svn copy -r1 O B ... # start r4 svn update svn merge ^/A@3 B ... I hope this will help me show some more concrete examples of what I'm trying to show in the graphs. - Julian

Received on 2012-05-30 22:36:19 CEST

This is an archived mail posted to the Subversion Dev mailing list.