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

[PATCH] Fix a conflict resolut

From: Stefan Hett <stefan_at_egosoft.com>
Date: Tue, 26 Jul 2016 17:46:09 +0200


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
are not required to resolve the conflict.

* libsvn_wc/conflicts.c
   (build_text_conflict_resolve_items): introduce new allow_ski_install
                                        and set it in the two cases where we
                                        simply accept the current local
file to
                                        resolve the conflict.

Stefan Hett

Received on 2016-07-26 17:46:22 CEST

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