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

Re: conflict resolver callback question / enhancement request

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-10-12 23:46:54 CEST

I've got a big patch in progress here, but it's causing some segfaults
in merge_tests, probably some simple error I made somewhere. I'll
post it here so others can look at it if they're curious. Later
tonight, I'll fix the errors and commit this as a starting point.

(This patch just expands the API for prop-conflicts, but doesn't
actually *use* the prop-conflict stuff yet.)

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

Received on Fri Oct 12 23:47:08 2007

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.