Re: Re: Flushing directory log accumulator during pool cleanup (Re: svn commit: r23342 - tr

On 11/6/07, Philip Martin <philipcodematters.co.uk>
wrote:
> "David Glasser" <glasserdavidglasser.net> writes:
>
> > Philip, I think the follow patch addresses your
concern and is also a
> > lot simpler than the "keep a boolean"
approach I'd suggested before.
> > What do you think?
> >
> > --dave
> >
> > [[[
> > 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.
> > ]]]
>
> Looks like a good solution.

Committed in r27634.  Thanks for the review!

--dave

-- 
David Glasser | glasserdavidglasser.net | http://www.davidglasser.
net/

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribesubversion.tigris.org
For additional commands, e-mail: dev-helpsubversion.tigris.org