Re: svn commit: r1419560 - /subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 10 Dec 2012 16:57:26 +0000 (GMT)
Bert Huijben wrote:
>> URL: http://svn.apache.org/viewvc?rev=1419560&view=rev
>> @@ -247,8 +247,8 @@ update_working_file(svn_skel_t **work_it
The db_op_set_property() here is just one of a series of DB modifications being made here, all within a single DB txn.
svn_wc__db_op_set_property() uses a txn internally, but is being called within a larger 'outer txn' (sorry if the terminology is wrong) set up by the top-level function, svn_wc__db_update_moved_away_conflict_victim(), which executes the whole call tree in this file (wc_db_update_move.c) within svn_wc__db_with_txn().
> I think the standard svn_wc_merge<something>() function should handle this
This is an archived mail posted to the Subversion Dev mailing list.