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

Re: merge-tracking -- getting my feet wet

From: Michael Brouwer <mb.7766_at_gmail.com>
Date: 2007-05-10 23:12:42 CEST

Warning possible bikeshed ahead,

Rather than revision should you maybe use the term change or changeset?
After all a revision is a snapshot of the tree, whereas a changeset are the
changes between that revision and it's predecessor (at least if I remember
the discussion about the -c option correctly.

--- Merging changeset 4 to 'trunk-wc':
U trunk-wc/zcpu.py
--- Merging changesets 6-7 to 'trunk-wc':
U trunk-wc/zstring.py

Michael

On 5/10/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
>
> On 5/10/07, John Peacock <jpeacock@rowman.com> wrote:
> > Ben Collins-Sussman wrote:
> > > Ah, that explains my confusion. These aren't endpoints being compared
> > > with each other, as in typical 'svn merge' or 'svn diff' invocations.
> > > You're saying that an svn_merge_range_t is just a *list* of revisions
> > > to merge?
> >
> > And if _you_ are confused, think about the random user who has no idea
> > what is going on internally. This is inconsistent with every other
> > merge-like operation, so I think this may call for a redesign (at least
> > of the user interface). Is it sufficient to say display (r-1):r (where
> > svn_merge_range_t contains just r)?
>
> I'm already ahead of you. :-) I just changed the UI to display this
> instead:
>
> --- Merging revision 4 to 'trunk-wc':
> U trunk-wc/zcpu.py
> --- Merging revisions 6-7 to 'trunk-wc':
> U trunk-wc/zstring.py
>
> In other words, we're claiming to merge 'lists of revisions', rather
> than showing our -rX:Y comparison syntax. I think that will prevent
> the confusion.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
>
Received on Thu May 10 23:12:55 2007

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