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

Re: [PATCH] 1/5 svnmerge: clearly differentiate urls, directories, and repo-relative paths

From: Dustin J. Mitchell <dustin_at_v.igoro.us>
Date: 2007-05-22 15:54:31 CEST

It seems I forgot to Cc: the list on this when I sent it a few days ago.

On Fri, May 11, 2007 at 02:23:05PM -0700, David James wrote:
> On 5/11/07, dustin@v.igoro.us <dustin@v.igoro.us> wrote:
> >On Thu, May 10, 2007 at 03:05:30AM -0500, dustin@v.igoro.us wrote:
> >> This is the first of five patches, the last of which implements
> >> cross-repository merging even when repo-relative paths are identical
> >
> >Any feedback on this? I realize it's basically changing comments, but
> >the good stuff is in parts 2-5 ;)
> Personally, I'm not a big fan of the term "locid", but other than
> that, your patch looks great. How about "path_id"? In the comments, we
> can explain that a path_id is a UUID/path pair. Further, in
> user-facing error messages where we talk about path_ids, we should
> probably call them UUID/path pairs, so that users will understand what
> we are talking about without needing to read the source.

Hmm.. I'm not married to any particular variable-name component, but the
user-facing text is important.

I chose "location identifier" because the term doesn't already have a
meaning in this context, and because it's an abstraction that I don't
necessarily want users to think concretely about. That's a little hard
to see in this patch, but in the end a location identifier can be any
one of a URL, a UUID+path, or a repos-relative-path. Conceptualizing it
as any one of those can lead to confusion.

I think that referring to it as a UUID/path pair, at least in this
patch, would be incorrect, since it does not involve a UUID. Later,
it's still a misleading name, since it may still be a
repos-relative-path and thus not imply any specific repository or UUID.
I can't think of a better term than "location identifier", although I
admit that its not ideal. Is there some consistent term other than
"location" in the Subverson lexicon for "a specific directory in a
specific repository"?

If there were svnmerge documentation somewhere I could patch, then a
quick description of "here are the ways svnmerge can identify a merge
source" would probably do the trick. Sadly, all the svnmerge
documentation I know of is in the source and in various users' blog
entries and web pages.

It's worth noting that all of this would be much less complicated if we
could just switch over to an unambiguous format like uuid+path or
complete URL; the abstraction is only required to maintain backward
compatibility, although I also leverage it to allow either uuid+path and
complete URL as well.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 22 15:54:39 2007

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