hwright (earlier version)


r27634 | glasser | 2007-11-06 15:21:15 -0600 (Tue, 06 Nov 2007)

Fix wc corruption caused by flushing potentially-incomplete logs
during baton cleanup on error, by only appending logs to the directory
baton when they represent a complete file-level operation.  Makes the
new update test #42 pass.

* subversion/libsvn_wc/update_editor.c
  (dir_baton): Explicitly document that the log_accum field must
   always be flushable.
  (close_directory, merge_file): Instead of writing directly to
   db->log_accum, make a temporary svn_stringbuf_t, write to it, and
   append it to db->log_accum in one operation at the end.

* subversion/tests/cmdline/update_tests.py
  (test_list): eof_in_interactive_conflict_resolver now passes.

Review by: dionisos
           hwright (earlier version)