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

Re: svn commit: r26336 - in trunk/subversion: include libsvn_client svn

From: Daniel Rall <dlr_at_finemaltcoding.com>
Date: 2007-08-29 10:26:41 CEST

On Aug 28, 2007, at 4:48 AM, C. Michael Pilato wrote:

> Daniel Rall wrote:
>> Should we allow querying of merge sources by URL (doc string seems to
>> indicate that we don't currently allow it)? If so, how are you
>> assuming
>> that the revision parameter will be passed now (e.g. in peg rev-
>> style)?
>> I think this needs a doc tweak either way to clarify things.
>
> We query merge sources so we can perform a merge. We (currently)
> can't
> merge *to* a URL, so there's no immediate use-case for querying
> potential
> merge sources for one.

Looks like you've hashed this out in Mark's thread -- thanks Mike
(and Mark).

>> The doc string on svn_client_suggest_merge_sources() (in
>> svn_client.h)
>> doesn't seem to reflect the fact that the suggestions are full URLs.
>> Question: Are these URLs also peg rev-style?
>
> Well, here's a question I had while making this change. They are
> full URLs
> with no revision information attached to them, just as they were
> before I
> abstracted out the code. But it does seem like they'd need at
> least some
> kind of peg revision to be useful, doesn't it?

That's what I was wondering, yeah.

...
>>> * subversion/libsvn_client/merge.c
>>> (svn_client__get_repos_root): Was get_repos_root.
>>> (svn_client_merge3): Update calls to svn_client__get_repos_root().
>>> (svn_client_merge_peg3): Disallow missing source paths, and leave
>>> merge source suggestion-taking to our caller. Update calls to
>>> svn_client__get_repos_root().
>>
>> Are any doc string changes to svn_client_merge_peg3() necessary as a
>> result of this change in behavior?
>
> Oddly, no. That 'source' was made to be optional didn't seem to be
> documented anywhere.

Okay -- the new behavior must've only documented for the command-line
client.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 29 10:37:56 2007

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