On 9/30/06, dionisos@tigris.org <dionisos@tigris.org> wrote:
> Author: dionisos
> Date: Sat Sep 30 12:13:35 2006
> New Revision: 21720
>
> Log:
> Fix 'Checksum mismatch' error when receiving update for
> replaced-with-history file.
>
>
> * subversion/libsvn_wc/update_editor.c
> (apply_textdelta): Update the revert-base (instead of the text-base)
> when updating a replaced file.
> (merge_file): Use the revert-base instead of the text-base when operating
> on replaced files.
>
> * subversion/libsvn_wc/adm_files.h
> * subversion/libsvn_wc/adm_files.c
> (svn_wc__open_revert_base,
> svn_wc__close_revert_base): New. Required to do working-copy internal
> update operations on the revert-base.
>
Great!
[snip]
>
> Modified: trunk/subversion/libsvn_wc/adm_files.h
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/adm_files.h?pathrev=21720&r1=21719&r2=21720
> ==============================================================================
> --- trunk/subversion/libsvn_wc/adm_files.h (original)
> +++ trunk/subversion/libsvn_wc/adm_files.h Sat Sep 30 12:13:35 2006
> @@ -172,6 +172,15 @@
> apr_int32_t flags,
> apr_pool_t *pool);
>
> +/* Open the revert-base for FILE.
> + * FILE can be any kind of path ending with a filename.
> + * Behaves like svn_wc__open_adm_file(), which see.
> + */
> +svn_error_t *svn_wc__open_revert_base(apr_file_t **handle,
> + const char *file,
> + apr_int32_t flags,
> + apr_pool_t *pool);
> +
> /* Close the text-base for FILE.
> * FP was obtained from svn_wc__open_text_base().
> * Behaves like svn_wc__close_adm_file(), which see.
> @@ -181,6 +190,15 @@
> int sync,
> apr_pool_t *pool);
>
> +/* Close the revert-base for FILE.
> + * FP was obtained from svn_wc__open_text_base().
Small typo: should be "FP was obtained from svn_wc__open_revert_base()."
> + * Behaves like svn_wc__close_adm_file(), which see.
> + */
> +svn_error_t *svn_wc__close_revert_base(apr_file_t *fp,
> + const char *file,
> + int sync,
> + apr_pool_t *pool);
> +
> /* Open the property file for PATH.
> * PATH can be any kind of path, either file or dir.
> *
>
[snip]
--
Ivan Zhakov
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Sep 30 22:03:32 2006