attached is a different approach to resolve the conflict resolution
issue based on stsp's suggestion.
The patch was tested against 1.9.x as well as trunk without triggering
any test failures.
It was also tested manually against TSVN 1.9.4 to confirm it resolves
the conflict resolution issue there.
Resolves the error case for binary file conflicts selecting to use the full
local version, by allowing using the local file, if no merged file is
(build_text_conflict_resolve_items): in case mine_abspath is null, take
local_abspath instead in case of
Suggested by: stsp
For the record: I certainly think that investigating Bert's idea to not
require setting an install path, if nothing needs to be installed,
sounds like a better approach, but this also seems to require more work
due to the test failures the previous patch triggered.
Received on 2016-08-16 17:54:53 CEST