[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: Jeremy Whitlock <jcscoobyrs_at_gmail.com>
Date: 2007-06-13 08:51:27 CEST

    Thanks for working with me on this. I think we both figured this
was much easier than it was especially since there are some verbiage
conflicts in the Subversion source that complicated this. I
appreciate your patience and guidance. I will make sure to take what
I've learned and use it in other patch submissions. The next things
I'll do are related to this. I'd like to update all four bindings to
work with this new functionality and there is also a revved function
that most uses of are still using the deprecated version. I'd like to
fix that too.

Take care,


On 6/12/07, Eric Gillespie <epg@pretzelnet.org> wrote:
> "Jeremy Whitlock" <jcscoobyrs@gmail.com> writes:
> > Eric,
> > Can you explain? I'm not familiar with the accept(2) system call.
> http://www.opengroup.org/onlinepubs/009695399/functions/accept.html
> But it doesn't matter, the point is that identifier is already
> taken. I'm going to commit now, but two things to keep in mind
> for future submissions: use spaces instead of tabs, and keep
> lines at 79 columns or less. I fixed one or two of these.
> Thanks!
> --
> 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 Wed Jun 13 08:51:39 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.