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

Problems with property conflict callback

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-10-24 23:41:13 CEST

We are looking at supporting this in Subclipse. We are finding when
the callback is called we are just getting paths to two files, the
"myPath" and "theirPath". There is no basePath and no mergedPath.
This begs a couple questions:

1) How can we do a 3-way diff without a base version of the property?

2) If we do #1, I do not see how we would tell SVN where the merged
results are located for it to use.

Adding Stefan to the cc: as I imagine he is also looking into this and
maybe he sees different behavior or has an idea how to handle it?

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 24 23:41:23 2007

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