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

Re: merging a link broken?

From: David O'Shea <david.oshea_at_s3group.com>
Date: 2007-12-07 09:13:00 CET

On 05/12/2007 23:47, Stefan Sperling wrote:
> On Wed, Dec 05, 2007 at 09:49:41AM +0000, David O'Shea wrote:
>> On 04/12/2007 23:13, Stefan Sperling wrote:
>>> Just as Mr. bfc0713 was saying, it looks like during the merge command,
>>> svn_io_file_open tries to open the symlink "link", but because the symlink
>>> target has already been deleted at that point the OS returns ENOENT.
>> I suspect this patch may be related:
>> http://svn.haxx.se/dev/archive-2007-11/1159.shtml
> That patch does not make my recipe script happy :(

The attach patch seems to fix this problem. However, it causes multiple
other tests to fail, so it's obviously not quite that simple. It's
definately something around there though.

The function has already detranslated the WC link to the repository
stored format and uses this for the diff3 call earlier on, but it's
using the link again here for the svn_io_files_contents_same_p call. The
patch changes it to use the detranslated file which fixes the merge, but
apparently breaks a number of other merge tests (I have not had a chance
to investigate why).


The information contained in this e-mail and in any attachments is confidential and is designated solely for the attention of the intended recipient(s). If you are not an intended recipient, you must not use, disclose, copy, distribute or retain this e-mail or any part thereof. If you have received this e-mail in error, please notify the sender by return e-mail and delete all copies of this e-mail from your computer system(s).
Please direct any additional queries to: communications@s3group.com.
Thank You.
Silicon and Software Systems Limited. Registered in Ireland no. 378073.
Registered Office: South County Business Park, Leopardstown, Dublin 18

Index: libsvn_wc/merge.c
--- libsvn_wc/merge.c (revision 28303)
+++ libsvn_wc/merge.c (working copy)
@@ -623,7 +623,7 @@
           svn_boolean_t same;
           SVN_ERR(svn_io_files_contents_same_p(&same, result_target,
- merge_target, pool));
+ tmp_target, pool));
           *merge_outcome = same ? svn_wc_merge_unchanged : svn_wc_merge_merged;

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Dec 7 09:13:23 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.