subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Hett <ste...@egosoft.com>
Subject Re: [PATCH] Fix a conflict resolution issue related to binary files (patch v2)
Date Tue, 26 Jul 2016 15:58:54 GMT
On 7/26/2016 5:46 PM, Stefan Hett wrote:
> Hi,
>
> based on the talk on IRC with stsp and Bert I'd like to propose the 
> following patch which would resolve an issue in TSVN when selecting to 
> prefer the local version of a binary file in conflict (see: "code 
> location related to investigate potential issue in resolve dialog" 
> thread on the TSVN user's mailing list for further details).
>
> [[[
> Teach build_text_conflict_resolve_items() to skip installling files, 
> if these
> are not required to resolve the conflict.
>
> * libsvn_wc/conflicts.c
>   (build_text_conflict_resolve_items): introduce new allow_ski_install 
> variable
>                                        and set it in the two cases 
> where we
>                                        simply accept the current local 
> file to
>                                        resolve the conflict.
> ]]]
>
Attached is a revised patch replacing the tabs with whitespaces of the 
original patch (spotted by stsp).

-- 
Regards,
Stefan Hett


Mime
View raw message