[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 resolution issue related to binary files (patch v4)

From: Stefan <luke1410_at_posteo.de>
Date: Sun, 28 Aug 2016 13:31:39 +0200

Hi,

attached is a new version of the patch which adds a regression test (the
actual patch/fix was left unchanged).
The regression test was tested against 1.9.4, 1.9.x and trunk r1743999.

I also tried to run the test against 1.8.16 but there it fails (didn't
investigate in detail).
Trunk r1758069 caused some build issues on my machine. Therefore I
couldn't validate/check the patch against the latest trunk (maybe it's
just some local issue with my build machine rather than some actual
problem on trunk - didn't look into that yet).

[[[
Fix issue #4647 by resolving 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 present.

* subversion/libsvn_wc/conflicts.c
  (build_text_conflict_resolve_items): in case mine_abspath is null, take
                                       local_abspath instead in case of
                                       svn_wc_conflict_choose_mine_full

* subversion/tests/cmdline/resolve_tests.py
  (automatic_binary_conflict_resolution): add new regression test

Suggested by: stsp
]]]

Regards,
Stefan

Received on 2016-08-28 13:31:52 CEST

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