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

Re: [PATCH] Fix a conflict resolution issue related to binary files (patch v4)

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Sun, 28 Aug 2016 18:23:21 +0000

Stefan wrote on Sun, Aug 28, 2016 at 13:31:39 +0200:
> 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).

For future reference, you might have tried building trunk_at_HEAD after
locally reverting r1758069; i.e.:

    svn up
    svn merge -c -r1758069
    <apply patch>
    make check

Stefan wrote on Sun, Aug 28, 2016 at 18:33:55 +0200:
> Got approved by Bert.

(Thanks for stating so on the thread.)

> Separated the repro test from the actual fix in order to have the
> possibility to selectively only backport the regression test to the 1.8
> branch.

Good call, but the fix and the "remove XFail markers" (r1758129 and
r1758130) should have been done in a single revision: they _are_
a single logical change. That would also avoid breaking 'make check'
(at r1758129 'make check' exits non-zero because of the XPASS).

Thanks for seeing this through!

Received on 2016-08-28 20:23:51 CEST

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