On Fri, 2008-10-24 at 17:28 +0200, Stephen Butler wrote:
> Current status: on the branch, the update-editor and its friends are
> finally playing nicely with each other and printing 'C' where we want
> it, at least for 'svn update'. I'll fix up the switch tests this
> evening (on the branch). And have a look at the situation for merge.
> Before we merge the tree-conflicts-notify branch into trunk, there are
> a couple of design issues to sort out.
> * Should we print ' C' or ' C(D->M)' for a tree conflict victim?
> SB: The latter (in the style of 'svn status --conflicts') is nice,
> but the former is simpler to generate and to test.
The simpler output is fine.
> * How much tree conflict info do we need to pass around in an update
> editor for use by the notify_func? Candidates include the
> following datatypes:
> 1. svn_boolean_t
> 2. svn_wc_conflict_reason_t
> 3. svn_wc_conflict_description_t
> SB: I plead for the simplest possible datatype, because then I
> make fewer mistakes. ;-)
Urg. Too many email threads in progress. Sorry, I'm crossing emails with
you. I already posted saying I want (3.), but anything will do for now.
It was only a desire to get _something_ happening on trunk that we could
all work with that led me to commit (3.) to trunk r33878 on Friday.
I wouldn't have minded (1), but I've just now completed testing a
catch-up merge to your branch which introduces (3), so rather than
abandoning it I'm committing it. Sorry if it feels like I'm being pushy
> * If it turns out that merge's update editor requires substantial
> changes to fix tree conflict notification, can we do that in a
> second diff?
That would have been no problem, and still is no problem if further
changes are needed.
You also posted saying let's merge the pre-r33891 state of the branch to
trunk. Yes, if it's an improvement on trunk, please do it! I'm not sure
if that means cherry-picking or reverting a susequent merge or what.
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-28 13:26:56 CET