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

Notifications of tree conflicts

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Tue, 21 Oct 2008 18:47:23 +0100

Neels,

I think broadly the notification should work like this:

The "action" field says Update/Merge/Revert/etc., the user's action.

The "text state" and "prop state" fields should say what happened to
text and prop. However, nothing happened to them because a tree conflict
was raised. I think we should ignore these fields. The sender should set
them both to "unknown", I recommend; "conflict" is another possibility.

And then we want, I suggest, a new field in svn_wc_notify_t to say "a
tree conflict is being raised". (This node is the victim.)

It looks like the stuff in svn_wc_notify_t is all a bit non-orthogonal:
for example, both the text and the properties have the possibility of
being reported independently as "missing", though it doesn't make sense
for one to be missing (meaning "the node is nmissing") and the other
not. Therefore don't worry about it all being totally logical: it's just
a tool for communicating what we think is most relevant thing to tell
the user.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-21 19:47:44 CEST

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