[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: David Glasser <glasser_at_davidglasser.net>
Date: Thu, 1 May 2008 03:06:12 -0700

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).

In addition to not being loggy, it isn't conditional on resolve_text,
and it doesn't deal with subst when copying from a base file to the
user's file.

--dave

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
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 12:06:40 CEST

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