Vincent Lefevre wrote:
> On 2006-01-14 01:17:36 +0000, Julian Foad wrote:
>>That's one view. I prefer to think that monotonic ordering of
>>svn:date is a requirement, and that a repository that violates the
>>requirement is broken.
> BTW, what does svk do concerning svn:date?
I've no idea.
>>If we really want an ability to select a disjoint set of revisions based on
>>their properties, we should introduce a generic ability to select a set of
>>revisions based on any of their properties - e.g.:
>> ((svn:date < 2000-01-01) OR (svn:author == julian)) AND (my:flag != "")
> Or "-r3977:3978,3998:4002". If I had this, I could have used one merge
> instead of two yesterday. :)
>>That sort of thing (especially filtering on svn:author) has been requested
>>before, specifically for "svn log" I think. I don't think there's
>>currently any other command that could sensibly make use of it.
> svn merge.
I didn't consider "svn merge" as a candidate for supporting an arbitrary set of
revisions because I was thinking that you cannot, in general, combine multiple
independent changes into a single change, because they might conflict with each
other. However, that's exactly what "svn merge" is designed to handle anyway,
so I was wrong: it does make sense for "merge" to take an arbitrary set of
revisions. It would apply each of the changes in turn (in some order, maybe
chronological, maybe the given order). This may result in conflicts, just like
a single-change merge can.
"svn diff" is similar to part of the operation of "svn merge". If we extend
"svn merge" in this way, we ought for consistency to extend "svn diff" in the
same way. What exactly would it do? I see two possibilities:
(a) Try to combine the given changes in the same way that "merge" does, and
possibly report conflicts.
(b) Output a sequence of independent diffs in turn; any conflicts among them
will be found at "patch" or "svn merge" time.
I suspect (b) would be more useful, but haven't thought deeply about it.
To unsubscribe, e-mail: email@example.com
For additional commands, e-mail: firstname.lastname@example.org
Received on Mon Jan 16 01:39:35 2006