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

Re: Slight problem with conflict resolution

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-07-19 17:41:52 CEST

Fixed in r25791.

Thanks for catching this. The internal diff3 invocation in fact turns
all three files into 'repository normal' form, and outputs a 4th
merged file, also in repository normal form. All four of these files
are then passed to the conflict-callback, and all are in
repository-normal form. (After the callback returns, then the
'selected' file is properly de-normalized and copied on top of the
working file.)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 19 17:40:59 2007

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