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

Issue #2064

From: Peter N. Lundblad <peter_at_famlundblad.se>
Date: 2004-10-14 23:58:44 CEST

Hi, folks,

I'm trying to solve issue #2064, which is about merge failing to create
symlinks (and expand keywords for that matter). It would be nice to have
this in 1.1.1 if possible, but it is no show-stopper. It's ugly though.

The problem is that the diff editor is designed to provide file
changes/additions in a callback and property changes in another callback.
So, when a file is merged, the old properties are still in effect. What is
necessary to do is to have the file retranslated (keywords expanded and so
on) when properties are merged. The problem is that I find no way outside
of libsvn_wc to do this. I tried svn_wc_merge with identical left and
right files, but that function was too smart. I.e. it didn't expand if the
file wasn't changed. Has anyone got an idea how to solve this? For 1.2, we
can have a public function for this. Maybe we should just punt and
document this as a known pbolem?

//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 14 23:43:43 2004

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