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

Re: svn commit: r39968 - trunk/subversion/libsvn_wc

From: Greg Stein <gstein_at_gmail.com>
Date: Mon, 12 Oct 2009 20:37:26 -0400

On Mon, Oct 12, 2009 at 18:42, Bert Huijben <rhuijben_at_sharpsvn.net> wrote:
>...
> +++ trunk/subversion/libsvn_wc/update_editor.c  Mon Oct 12 15:42:16 2009        (r39968)
>...
> @@ -4386,7 +4358,7 @@ merge_file(svn_wc_notify_state_t *conten
>                even if the file is not modified compared to the (non-revert)
>                text-base. */
>             SVN_ERR(svn_wc__loggy_copy(&log_accum,
> -                                       svn_wc__adm_access_abspath(adm_access),
> +                                       fb->dir_baton->local_abspath,
>                                        new_text_base_abspath,
>                                        fb->path, pool, pool));

Missed a chance for pb->local_abspath

>...

Cheers,
-g

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2406861
Received on 2009-10-13 23:31:11 CEST

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