[PATCH] diff-callbacks3 branch (for detecting tree conflicts)

[Julian Foad <ju...@btopenworld.com>]

Dear all,

May I now merge /branches/diff-callbacks3/ to trunk? We held off to avoid 
increasing the difficulty of back-porting other changes to 1.5.x, but it feels 
like the risk of complicating any further back-port that might still be 
required is really low now.

Here's the branch creation log message:
[[[
r29985 | stsp | 2008-03-21 21:42:28 +0000 (Fri, 21 Mar 2008) | 16 lines

Create a branch to hold the extended client diff callbacks
we need for the tree-conflicts branch.

Since the callbacks themselves are not specific to tree-conflicts,
and putting them on trunk is impractical at the moment due to ongoing
1.5 related work, we stash them here for the time being.

Even though the tree-conflicts branch depends on this
branch, it can be merged into trunk separately.

See also issue #3134
[...]
]]]

The essence is that it adds "dir_opened" and "dir_closed" callbacks to the diff 
callbacks. It doesn't yet do anything in them, so overall functionality is 
unchanged. It's an enabler for tree conflict detection.

I reviewed Stephen Butler's patch which is on this branch a while back. Another 
review wouldn't hurt, of course. To this end, I've attached the (branch to 
trunk) diff here as a patch for people who find it easier to review this way, 
including the main part of the log message of r29989 which is the main 
substance of the branch.

This passes "make check" and I'm ready to merge if I can just get some 
confirmation that now's a good time.

- Julian

Re: [PATCH] diff-callbacks3 branch (for detecting tree conflicts)

[Karl Fogel <kf...@red-bean.com>]

Julian Foad <ju...@btopenworld.com> writes:
> May I now merge /branches/diff-callbacks3/ to trunk? We held off to
> avoid increasing the difficulty of back-porting other changes to
> 1.5.x, but it feels like the risk of complicating any further
> back-port that might still be required is really low now.

IMHO, yes.  1.5.x has branched, and trunk is open for business now.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org