[tree conflicts] Dropping user-visible files from the design (was: Re: question about the update editor (essentially))
From: Stefan Sperling <stsp_at_elego.de>
Date: 2007-12-13 13:30:01 CET
On Wed, Dec 12, 2007 at 10:03:52PM +0100, Stefan Sperling wrote:
I had a nice discussion with David Glasser on IRC about this yesterday.
Somewhere in the middle of trying to explain the issue to
The answer I found somewhere in the very back of my head was that
Given that we are now changing existing API *and* the working copy
I propose the following:
When an update that caused tree conflicts has completed,
Now, instead of having a text file that mirrors that state of the data
We could also add an libsvn_wc API to query the working copy about
"svn resolved <tree-conflict victim path>" would clear data about
Oh, and if the temporary file really is desirable, we can still
Does this change sound reasonable?
-- Stefan Sperling <firstname.lastname@example.org> Software Developer elego Software Solutions GmbH HRB 77719 Gustav-Meyer-Allee 25, Gebaeude 12 Tel: +49 30 23 45 86 96 13355 Berlin Fax: +49 30 23 45 86 95 http://www.elego.de Geschaeftsfuehrer: Olaf Wagner
This is an archived mail posted to the Subversion Dev mailing list.