[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-12 21:36:21 CEST

Eric Gillespie <epg@pretzelnet.org> writes:

> "Jeremy Whitlock" <jcscoobyrs@gmail.com> writes:
> > Hi All,
> > Attached is revision three of the patch for issue 2784, automatic
> > conflict resolution. You should notice the proper verbiage being used
> > in the patch and that the changes Eric suggested last have been taken
> > into account during this new version of the patch.
> Looks good to me. Building and testing now, then commit.

Oops, there's a minor problem: your accept variables shadow the
accept(2) system call.

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 Tue Jun 12 21:36:30 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.