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

2016-08-28 Thread Bert Huijben
> -Original Message- > From: Daniel Shahaf [mailto:d...@daniel.shahaf.name] > Sent: zondag 28 augustus 2016 20:23 > To: Stefan <luke1...@posteo.de> > Cc: dev@subversion.apache.org > Subject: Re: [PATCH] Fix a conflict resolution issue related to binary files &g

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

2016-08-28 Thread Stefan
On 8/28/2016 20:23, Daniel Shahaf wrote: > 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

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

2016-08-28 Thread Daniel Shahaf
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

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

2016-08-28 Thread Stefan
On 8/28/2016 13:31, Stefan wrote: > 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

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

2016-08-28 Thread Stefan
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