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

Re: [PATCH] Add option to resolve conflicts by selecting a specific file (Issue 2784)

From: Eric Gillespie <epg_at_pretzelnet.org>
Date: 2007-06-08 19:29:05 CEST

"Jeremy Whitlock" <jcscoobyrs@gmail.com> writes:

> What is the real purpose of svn_accept_invalid? I can see it being
> returned from svn_accept_from_word when an invalid accept word is
> passed as an argument but beyond that, how else do you see it being
> used?

That's it. The point is this: you have an error condition when
someone says --accept=goat. That means your from_word function
needs to return something other than a valid value.

> I also think that the command line parsing should handle this
> as an error when you pass an invalid value as the accept flag. This
> is how I do it now but you suggest otherwise. Can you explain?

No, i don't suggest otherwise :). Hope it's clear now.

> The other things you mentioned are valid. Sometimes it is easy to
> look over small things like docstrings when trying to get code
> working. Please bear with me with this patch as I'm learning the
> Subversion coding standards and API as I go along.

Hey, no problem!

Eric Gillespie <*> epg@pretzelnet.org
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 8 19:29:13 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.