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

Re: [PATCH] Add regression test for issue #3686:executable flag not correctly set on merge

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Wed, 19 Jan 2011 23:51:55 +0200

Daniel Becroft wrote on Wed, Jan 19, 2011 at 21:17:23 +1000:
> Thanks, Daniel. I've attached a new version of the patch, with amended log
> message below.

Thanks, Daniel. I added a missing article to the log message,
wrapped to 80 characters, added another pair of "is executable"
checks (per my earlier mail), and committed this as r1061020.

> Blair: I've also looked at *why* this problem exists, and it's due to
> the "Special case" merge of binary files (libsvn_client/merge.c:1454).
> If (right == working), then do a simple file copy from the temporary
> file (which is not marked as +x). This means that we don't run
> svn_wc_merge4. Unfortunately, this means that a workqueue is not
> created, and the sync_file_flags is never run. As to what the fix is,
> I have no idea.

Perhaps one of the wc folks will chime in here.

(I'm not familiar with that part of the code, and don't have the time
right now to go investigate it.)
Received on 2011-01-19 22:56:03 CET

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