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

Re: [PATCH] Updating a locally modified file with endline translation

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-02-14 22:35:50 CET

Vladimir Prus <ghost@cs.msu.su> writes:
> Log message:
> Fixes a bug that prevented updating a locally modified file when endline
> translation for the file is turned on.
>
> * subversion/libsvn_wc/get_editor.c (svn_wc_install_file): Make path
> for a temporary file relative to the directory where update happens.
>
> * subversion/tests/clients/cmdline/update_tests.py
> (update_modified_with_translation): New function.
>
> Patch (against rev 1272)
>
> Index: ./subversion/libsvn_wc/get_editor.c
> ===================================================================
> --- ./subversion/libsvn_wc/get_editor.c
> +++ ./subversion/libsvn_wc/get_editor.c Thu Feb 14 17:04:57 2002
> @@ -1843,6 +1843,13 @@
> FALSE,
> pool));
>
> + /* Make the temporary working file name relative to
> + the parent directory. */
> + tmp_working = svn_stringbuf_ncreate
> + (tmp_working->data + parent_dir->len + 1,
> + tmp_working->len - parent_dir->len - 1,
> + pool);
> +
> /* Copy the working file to tmp-working with
> LF's, and any keywords contracted. */

The context here doesn't show it, but this new assignment to
tmp_working immediately follows another assignment (by reference) to
tmp_working. They can't both be right, since the first *use* of the
variable occurs later on. :-)

Also it seems odd that the old way would work in most circumstances,
yet not for your reproduction recipe. Suspect there's something
deeper going on here, and am looking...

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:08 2006

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