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

svn_io_run_diff3+svn_wc_merge2 question

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2006-06-24 20:01:52 CEST

I'm looking at svn_wc_merge2 and think there's a lot that can be
improved only in that function alone. I have some questions on its use
of svn_io_run_diff3_2 though.

* svn_io_run_diff3_2 documents it wants its target, left and right
path parameters to be relative to its working dir argument.

* svn_wc_merge2 however says 'our merge function' (presumably
svn_io_run_diff3) requires all files to be in the same directory.

The two requirements above are a huge difference, because if we could
relax the code in svn_wc_merge2, we could eliminate 2 full file copies
in the common case [without the need to complicate other cases].

I'd like to change the current code, but would like to know if anybody
knows how the current comment got in there... What risks do I run
when changing it to the requirements mentioned in svn_io_run_diff3_2?

bye,

Erik.

CC-ing Ben because blame attributes the text to him at r1575.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jun 24 20:02:20 2006

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