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

Re: "svn resolve --accept=mine-full" is not loggy

From: <epg_at_google.com>
Date: Thu, 01 May 2008 09:11:27 -0700

"David Glasser" <glasser_at_davidglasser.net> writes:

> On Wed, Apr 30, 2008 at 6:35 PM, David Glasser <glasser_at_davidglasser.net> wrote:
> > Is this a problem?
>
> I'm specifically referring to the code
>
> if (auto_resolve_src)
> SVN_ERR(svn_io_copy_file(
> svn_path_join(svn_wc_adm_access_path(conflict_dir), auto_resolve_src,
> pool),
> path, TRUE, pool));
>
> in subversion/libsvn_wc/adm_ops.c(resolve_conflict_on_entry).

Good thing you copied me, or I'd never have guessed that I was
involved in this! This is Jeremy's Whitlock patch, but I suspect
he's no more familiar with the nitty gritty details of the wc
than I am. I do not know the answer to your question, though if
I had to bet, I'd say "yes".

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-01 18:11:57 CEST

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