RE: svn commit: r40357 - trunk/subversion/libsvn_wc
Bert Huijben <[email protected]>
| Newsgroups | gmane.comp.version-control.subversion.rapidsvn.devel,gmane.comp.version-control.subversion.svn |
|---|---|
| Message-ID | <001401ca5c70$687e9860$397bc920$__40232.5307870798$1257244159$gmane$org@nl> |
> -----Original Message----- > From: Hyrum K. Wright [mailto:[email protected]] > Sent: maandag 2 november 2009 21:28 > To: svn-lmwclWVctOZK/[email protected] > 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). Bert ------------------------------------------------------ http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2414076