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

jpieper@tigris.org writes:

> Author: jpieper
> Date: Sun May 23 15:52:47 2004
> New Revision: 9868

> Modified: trunk/subversion/libsvn_wc/update_editor.c
> ==============================================================================
> --- trunk/subversion/libsvn_wc/update_editor.c (original)
> +++ trunk/subversion/libsvn_wc/update_editor.c Sun May 23 15:52:47 2004

> @@ -2218,7 +2296,7 @@
> update. Then we'll notify that it has text conflicts. This
> seems okay to me. I guess. I dunno. You? */
>
> - if (tc)
> + if (merge_outcome == svn_wc_merge_conflict)
> *content_state = svn_wc_notify_state_conflicted;
> else if (new_text_path)
> {

$ svn diff -rHEAD
Index: wc/foo
===================================================================
--- wc/foo (revision 2)
+++ wc/foo (working copy)
@@ -1,2 +1 @@
 foo
-foo
$ valgrind -q svn up wc
==1608== Conditional jump or move depends on uninitialised value(s)
==1608== at 0x4027C04C: install_file (update_editor.c:2299)
==1608== by 0x4027C290: close_file (update_editor.c:2355)
==1608== by 0x40313DDE: close_file (cancel.c:236)
==1608== by 0x402A016F: update_entry (reporter.c:692)
U wc/foo
Updated to revision 2.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org