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

Re: [PATCH] Fix merging with broken softlink as target

From: David O'Shea <david.oshea_at_s3group.com>
Date: Thu, 08 May 2008 14:37:28 +0100

On 07/05/2008 22:10, Karl Fogel wrote:
> "David O'Shea" <david.oshea_at_s3group.com> writes:
>> Updated patch attached.
> 'make check' says it fails two regression tests:
> update_tests.py 28: handle eol-style propchange during update
> merge_tests.py 41: handle eol-style propchange during merge

Ok, this is interesting. I've been looking at merge test 41 for a while
and the difference with the patch applied is that a merge of a propset
eol-style change into the working copy applies the propset but does not
rework the line endings in the local file until committed.

Without the patch applied, the line endings of the file in the wc get
updated immediately as part of the merge.

However, the first situation (where the patch is applied) means that
merging the propset now has the same effect as manually doing the
propset (i.e. manually doing svn ps eol-style does not change the line
endings in the local file until you commit).

So, my question is this... is the fact that the line endings were
changed as part of the merge of a propset, but not by a manual propset a
bug that this patch (inadvertently) fixes or was that difference a
deliberate decision?


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_at_s3group.com.
Thank You.
Silicon and Software Systems Limited. Registered in Ireland no. 378073.
Registered Office: South County Business Park, Leopardstown, Dublin 18
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-08 15:37:51 CEST

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.