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

Re: Merge tracking proposal, rev 2

From: Daniel Berlin <dberlin_at_dberlin.org>
Date: 2006-05-17 23:57:56 CEST

Julian Foad wrote:
> Daniel Berlin wrote:
>> On Mon, 2006-05-08 at 08:58 -0700, Michael Brouwer wrote:
>>> I like the idea of specifing a peg rev in the merge source. However
>>> just what exactly what would /trunk@123:1-4691 mean?
>> revisions 1-4691 of the object known as /trunk in revision 123.
>
> Think about this question: What is the meaning of "/trunk" in that line with
> respect to the "1-4691", and what is the meaning of "@123"?
>
>
> It looks to me like you don't want a separate peg revision to be specified here
> ("/trunk:1-4691"). Instead, each revision in the list is implicitly the peg
> revision in which the path is looked up (/trunk@1, /trunk@100, ...,
> /trunk@4691), and so the line might refer to a series of different objects that
> all existed at the same path at different times. I don't know if that's what
> you want, but there's not necessarily a problem with it.

Actually, after talking with others on IRC, I think this should actually
work out okay, and i've modified the spec to remove the peg revs again

I'll check the new spec into trunk, instead of just on the branch, as
has been requested by lundlad and some others.

>
> - Julian
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed May 17 23:58:26 2006

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