On Tue, Jan 10, 2012 at 2:07 PM, Bert Huijben <b...@qqmail.nl> wrote: > >> -----Original Message----- >> From: Paul Burba [mailto:ptbu...@gmail.com] >> Sent: dinsdag 10 januari 2012 17:36 >> To: Bert Huijben >> Cc: Subversion Development; Stefan Küng >> Subject: Re: Crash when updating > > <snip> >> if (! from_val) /* adding a new property */ >> SVN_ERR(apply_single_prop_add(state, &conflict_remains, >> db, local_abspath, >> left_version, right_version, >> is_dir, actual_props, >> propname, base_val, to_val, >> ### ^^^^ >> ### This is obviously going to blow up since to_val is null! >> >> conflict_func, conflict_baton, >> dry_run, result_pool, iterpool)); >> ]]] >> >> So it seems we need to put >> subversion/libsvn_wc/wc_db.c:svn_wc__db_external_read_pristine_props( >> ) >> back. Does that seem right to you, or is there a better way? > > I think we need to call svn_wc__db_read_pristine_props() instead. > > The db_external_ variants of the db functions are from when file externals > were stored in a different SqLite table
That works, thanks. Fixed r1229833. Nominated for backport to 1.7.3. Paul
