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

RE: svn commit: r40357 - trunk/subversion/libsvn_wc

From: Bert Huijben <rhuijben_at_sharpsvn.net>
Date: Tue, 3 Nov 2009 11:28:38 +0100

> -----Original Message-----
> From: Hyrum K. Wright [mailto:hyrum_at_hyrumwright.org]
> Sent: maandag 2 november 2009 21:28
> To: svn_at_subversion.tigris.org
> Subject: svn commit: r40357 - trunk/subversion/libsvn_wc
> Author: hwright
> Date: Mon Nov 2 12:28:21 2009
> New Revision: 40357
> Log:
> * subversion/libsvn_wc/props.c
> (svn_wc__merge_props): Flush a couple of log accumulators.

This function did not flush its own log accumulaters. It is always flushed
by its callers. (Which use it in transactions).

This change can install a conflict for a update/merge that is never written
to the working copy (e.g. when the file interactive conflict handler cancels
the operation).

These operations should be moved up in the call chain to the final location
where the db, the working file, the properties, the conflict and the dav
properties are updated at once (all or nothing).


Received on 2009-11-03 11:29:05 CET

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