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

Re: svn commit: r24342 - trunk/subversion/include

From: Peter Lundblad <plundblad_at_google.com>
Date: 2007-04-03 18:05:57 CEST

Daniel Rall writes:
> On Tue, 03 Apr 2007, Peter Lundblad wrote:
> > dlr@tigris.org writes:
> ...
> > > - * @a path_or_url is a WC path or repository URL. @a revision is the
> > > - * revision at which to get @a path's merge info.
> > > + * @a path_or_url is a WC path or repository URL. If @a path_or_url
> > > + * is a WC path, @a revision is ignored in preference to @a
> > > + * path_or_url's @c BASE revision. If @a path_or_url is a URL, @a
> >
> > AFAICT from the code, this is WORKING, not BASE, right?
> As we're referring to a revision number, the number for WORKING and
> BASE are identical. At the time I thought saying BASE would make this
> more clear, but I really don't feel strongly about it.

I saw you already fixed this, but just for the record: if you have merged
things locally, but not committed yet, then this API will return the local
merge info, right? That's why it is *important* to say WORKING and not BASE

Best regards,

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Apr 3 18:06:29 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.