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

Re: svn2cvsgraph, how to best handle merges?

From: Henrik Carlqvist <hc528_at_poolhem.se>
Date: Thu, 27 Mar 2014 13:59:50 +0100

On Thu, 27 Mar 2014 11:25:33 +0100
"Bert Huijben" <bert_at_qqmail.nl> wrote:
> If you have any input on that thread, please let us know so we can just
> create the api you need to get the information you need.

My tool does not call use subversion api, it simply uses popen to call the
svn command line client.

So what I was hoping was to get some kind of "svn log -g -q" which only
displays all merge points once. Prefarably by only a single call to
svn, maybe by giving the subversion repository root as an argument, maybe
by giving some extra flag asking svn to omit recursive merges.

However, if it would be easier to give this kind of functionality by the
API than by the command line tool I could rewrite my tool to use the API.

> Of course we can't add it to old Subversion server versions, but we
> surely can add new apis...

I understand that. Once we get a working combo I will simply have to
document a requirement that at least version v.x of subversion is needed
to work togehter with version w.z of svn2cvsgraph.

> But we need usecases to create apis... and preferably testcases.
>
> If there is some very rough prototype that you can share... perhaps with
> pointers on how it can and should be improved we can work together on
> adding the apis that you need.

Looking at the test case posted at
http://svn.haxx.se/users/archive-2014-02/0219.shtml

I think that the most effective output for my program to parse would be
something like:

------------------------------------------------------------------------
r12 | henca | 2014-02-25 13:06:18 +0100 (Tue, 25 Feb 2014)
------------------------------------------------------------------------
r11 | henca | 2014-02-25 13:06:17 +0100 (Tue, 25 Feb 2014)
Merged via: r12
------------------------------------------------------------------------
r10 | henca | 2014-02-25 13:06:16 +0100 (Tue, 25 Feb 2014)
Merged via: r11
------------------------------------------------------------------------
r9 | henca | 2014-02-25 13:06:15 +0100 (Tue, 25 Feb 2014)
Merged via: r10
------------------------------------------------------------------------
r8 | henca | 2014-02-25 13:06:14 +0100 (Tue, 25 Feb 2014)
------------------------------------------------------------------------
r5 | henca | 2014-02-25 13:06:12 +0100 (Tue, 25 Feb 2014)
Merged via: r8
------------------------------------------------------------------------
r7 | henca | 2014-02-25 13:06:13 +0100 (Tue, 25 Feb 2014)
------------------------------------------------------------------------
r6 | henca | 2014-02-25 13:06:13 +0100 (Tue, 25 Feb 2014)
------------------------------------------------------------------------
r5 | henca | 2014-02-25 13:06:12 +0100 (Tue, 25 Feb 2014)
------------------------------------------------------------------------
r4 | henca | 2014-02-25 13:06:12 +0100 (Tue, 25 Feb 2014)
------------------------------------------------------------------------
r3 | henca | 2014-02-25 13:06:12 +0100 (Tue, 25 Feb 2014)
------------------------------------------------------------------------
r2 | henca | 2014-02-25 13:06:11 +0100 (Tue, 25 Feb 2014)
------------------------------------------------------------------------
r1 | henca | 2014-02-25 13:06:11 +0100 (Tue, 25 Feb 2014)
------------------------------------------------------------------------

In the example output above, there is exactly one "Merged via:" for each
commited "svn merge".

I am fully aware that reading the log above by hand after following the
svn commands at http://svn.haxx.se/users/archive-2014-02/0219.shtml is a
little bit hard to follow. Looking at a .png file with merge arrows makes
it a lot easier to follow. I have placed such a file at
http://poolhem.se/bilder/revision_graph.png

Output like the one above would probably be the easiest for my program to
parse, but if I get some kind of api I could also use that.

regards Henrik
Received on 2014-03-27 14:00:34 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.