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

Re: Q: editor callback order?

From: Stephen Butler <sbutler_at_elego.de>
Date: Fri, 07 Nov 2008 11:09:20 +0100

Quoting "Neels J. Hofmeyr" <neels_at_elego.de>:


> Dir add and dir prop mod get split into two lines.
> This could be handled by a dir_closed() callback in
> svn_wc_diff_callbacks3_t, I admit. Now that I get your approval about
> sending diff notification on parent directories only after its children. I
> still think it's not ideal, but I see why it's preferable anyway.
> diff --summarize
> dir_added() Silence.
> Process children.
> dir_props_canged() Silence.
> dir_closed() Notify `AM dir'

IMHO this is better than 2 separate lines, even if it arrives later
than notifications about the dir's descendants.


> I would still like to illuminate one case, so I completely understand:
> Say I run a merge that only wants to change one prop on one directory. Say
> there is nothing versioned at that path in the target, and thus, a prop
> change is causing a tree-conflict. But how is this caught?
> merge
> dir_opened() Is there a file on disk instead? No.
> Is this dir missing or unversioned? Yes! TC!
> <skip the rest>
> How do we ever know the conflict was due to a property change? Do we never
> need to know that?
> Info currently says "The merge attempted to edit 'modified_dir'". This same
> message will show for all of a dir prop change, a child node modification,
> or presence of both.

I think that's OK. In the future, we might record the attempted
changes while walking the tree-conflicted dir, as 'merge --dry-run'
already does (for deletions, anyway), and print a summary or diff
on demand.

For now, the user will have to call 'svn diff --summarize' to
see the preview of incoming changes. That applies to update/
switch, too.


Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-07 11:09:44 CET

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.