On Thu, Apr 10, 2008 at 11:32:06PM +0100, Julian Foad wrote:
> I had been thinking the following would be a clean and desirable design,
> bearing in mind that the topic is tree-conflict _detection_ only:
> - "Leave the WC untouched by this attempted incoming change."
> However, the way text conflicts work is:
> - "Leave the WC containing (files that have) all of the information about
> both sides of the conflict."
> The doc <notes/tree-conflicts/scratch-pad.txt> contains a "Scenario
> Playground" in which the thoughts appear to be more along the lines of:
> - "Leave the WC as if the incoming change had been applied first and then
> the user had made the necessary changes to get back to the state he
> I have not yet tried to define how either of these other styles would apply
> consistently to all cases.
> Your thoughts, please.
I think this needs to be decided on a case-by-case basis. E.g. we had
some discussion about what to do with deleted files, and ended up
carrying out the delete, but leaving the file behind unversioned.
This was a good decision in my opinion.
If we decided now not to make any changes to the working copy in case
of tree conflicts, we'd have to reexamine each use case and have a huge
discussion whether this behaviour is desirable in all use cases.
If we keep on discussing the correct behaviour on a case-by-case basis,
we likely won't end up changing former decisions we've made -- and thus
we won't end up doing work again that's already been done.
> WHICH CASES WE WANT TO DETECT
> (This section is long. A practical difficulty is below, marked with "!!!".)
> I think the conflicts we want to detect on directory operations are exactly
> analagous to those on files, with the difference that to "modify" a
> directory means to modify anything in the whole directory tree.
I'm still not sure on this definition of "modify". I admit that I
probably haven't considered all possible scenarios, but I think it
would be nice to try to define modification of a directory as
"a direct child of the directory was modified". If this definition
turns out to be enough (which it may well turn out to be) we can
save us the trouble of recursing into deep directory trees to detect
Note that I consider "equality" between directories a different issue
than "a directory has been modified". Detection equality may well need
recursion as outlined elsewhere in this thread.
> For both files and directories, and for all of "update", "switch" and
> "merge", the same principle applies: if the incoming change is trying to
> delete/move/modify something that has already gone away from the equivalent
> path in the target, or to create something that is already created in the
> target, that's a tree conflict.
> | Change ... merged onto ... TargetChange
> | | |
> | v | CREATE GO-AWAY REPLACE MODIFY
> | ------- + ------- ------- ------- -------
> | CREATE | C X X X
> | |
> | GO-AWAY | X C C C
> | |
> | REPLACE | X C C C
> | |
> | MODIFY | X C C merge
> A practical difficulty arises with determining the "target change" in a
> "merge" situation. The correct behaviour is to compare the merge-left
> source and the target in order to decide whether the target path under
> consideration is to be considered "created" or "gone away" (these being
> easy to determine) or "replaced" or "modified" (these being potentially
> much more expensive to determine). A directory tree could be modified only
> somewhere deep in its hierarchy and there is no way to determine this just
> by looking at the information immediately available for the directory
> The implementation uses the diff_callbacks mechanism to communicate the
> change being applied by the merge. We are adding (in the "diff-callbacks3"
> branch) "dir open" and "dir close" callbacks. Perhaps we can use something
> like this to provide enough information to more quickly determine whether a
> given directory D in the merge-left source is in fact identical to the
> corresponding one in the target.
> The current approach taken in the implementation is, when a case occurs
> that might be a conflict (and the only such case is a merge trying to
> delete a file that might have be "modified" (meaning "different") on the
> target), we do a full-text comparison if necessary. Now that we want to
> extend this to the case of a directory tree, we think a full comparison may
> be prohibitively expensive.
I think we will have to walk the directory tree, querying the repository
for each node about the equivalent on the merge left. As this is very
expensive, I really hope there is a more efficient way to do this.
I have no better idea currently, though :(
> I have attached some notes on what tree-conflicts work is happening where,
> and my opinion of the level of agreement we've reached on the various
> aspects of this work.
Very nice. The doc overhaul may need an issue in the tracker.
> How Subversion presents tree conflicts:
> - General agreement. The precise form of the messages and status indications
> are not seen as important as long as they give enough information.
> - Exception: Unclear on the expected WC state when a conflict is raised, which
> is an important issue related to resolving. e.g. the outcomes proposed in
> <trunk/notes/tree-conflicts/scratch-pad.txt> are radically different from
> some of our thinking.
The scratch-pad contains very early notes by C. Michael Pilato.
Since he has been giving feedback about the current implementation,
I guess he won't object with the current state of things, even if
some of it contradicts the scratch pad.
Stefan Sperling <stsp_at_elego.de> 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
Received on 2008-04-13 17:03:11 CEST
- application/pgp-signature attachment: stored