On Thu, Mar 24, 2011 at 10:39, <rhuijben_at_apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Mar 24 14:39:55 2011
>...
> @@ -3615,10 +3609,10 @@ merge_file(svn_skel_t **work_items,
> *install_pristine = FALSE;
> *install_from = NULL;
>
> - if (new_text_base_sha1_checksum != NULL)
> + if (fb->new_text_base_sha1_checksum != NULL)
> SVN_ERR(svn_wc__db_pristine_get_path(&new_text_base_tmp_abspath,
> - eb->db, fb->local_abspath,
> - new_text_base_sha1_checksum,
> + eb->db, pb->local_abspath,
> + fb->new_text_base_sha1_checksum,
> pool, scratch_pool));
Euh... I don't think you meant to replace fb->local_abspath with pb->
... did you? That sounds quite incorrect. IIRC, that would be asking
for the pristine path of the containing directory.
And assuming that... why did this not create test failures?
>...
Cheers,
-g
Received on 2011-03-24 18:34:17 CET