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

Re: RFC: svn mergeinfo improvements for 1.5

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Thu, 27 Mar 2008 16:37:43 -0400

Mark Phippard wrote:
> On Thu, Mar 27, 2008 at 4:24 PM, Paul Burba <ptburba_at_gmail.com> wrote:
>> On Thu, Mar 27, 2008 at 3:36 PM, C. Michael Pilato <cmpilato_at_collab.net> wrote:
>> > C. We still support --from-source. But we apparently have decided to
>> > support *not* providing a source, we still has us trying to deal with
>> > multiple sets of output at once (dividers, indentation, etc.). That reduces
>> > the scriptability of the output's one-rev-per-lineness, because now wrappers
>> > have to pay attention to these section dividers and maintain state. :-(
>> If scriptibility is that important, than how about this (possibly
>> quite crazy) idea:
>> i) If you don't provide a --from-source but there is only *one* from
>> source then svn mergeinfo works. This saves users from typing
>> --from-source all the time, for the 1.5.x branch for example.
>> ii) If you don't provide a --from-source but there are *multiple*
>> sources, then return an error saying there are multiple sources and
>> one must be specified (and suggesting iii).
>> iii) Add --show-sources option which lists all the merge sources (one
>> source per line of course, allowing scripts to run this first then run
>> svn mergeinfo --from-source on each result).
> These are pretty good ideas. I was thinking something similar but
> could not get to the point of a suggestion. While I tend to think a
> user will only need to see one output, the one part I was concerned
> about was how can they see a list of what they can look at.
> Maybe a bikeshed, but could we possibly do --show-revs=sources ?

I actually kinda like this idea. It was already a concern of some that if
you made a branch but didn't merge to it, it never showed any hints about
places you might want to merge from. Maybe this is a chance to resolve
that, too, but simply calling the suggest_merge_sources() API (which returns
a superset of the mergeinfo paths) and displaying those paths as options.
Given that, a script could iterate over the output of 'svn mergeinfo
--show-revs=sources' and call 'svn mergeinfo --show-revs=eligible
--from-source=SOURCE' and so on.

C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2008-03-27 21:38:03 CET

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