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

Re: WC-NG: the trees BASE, WORKING and ACTUAL [was: svn commit: r33021 - branches/explore-wc/subversion/libsvn_wc]

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: Thu, 11 Sep 2008 20:26:26 +0200

>> I submit that it is much more sensible to define WORKING as I suggested
>> in my earlier mail. (i.e. having the disk file contents)
> I agree. I had considered this in the course of composing my mail, but lost
> it by the time I finished editing. I should have said
> BASE + Subversion-managed changes + file content modifications = WORKING.
> WORKING + non-textual-and-non-Subversiony-changes = ACTUAL.

Well, I would have liked to put it that way, but how does that work in
this scenario:

 $ rm file.txt
 $ mkdir file.txt


> Are file contents the only exception of note here? For example, I'm not
> sure how to categorize today's handling of merge reject files. They live in
> the ACTUAL space, but their absence affects interpretation of the WORKING
> tree (conflicted flag staleness and ultimate irrelevance).

The same problem applies to properties merge failures. I have no
immediate answer.



To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-11 20:26:43 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.