Re: problems writing a regression test for issue 4647

Stefan wrote on Sun, Aug 28, 2016 at 00:06:19 +0200: > START: resolve_tests.py > W: Unexpected output > W: EXPECTED STDOUT (unordered): > W: | Resolved conflicted state of 's' > W: | Resolved conflicted state of 'v' > W: | Resolved conflicted state of 'n' > W: | Resolved conflicted state of '-' > W

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

On 8/16/2016 17:54, Stefan Hett wrote: > Hi, > > 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

problems writing a regression test for issue 4647

Hi, I'm currently trying to put together a regression test for issue #4647 [1] in order to serve as a test/validation for the patch proposed in [2]. I think I got to the point where the test actually does what I want it to do, but it currently unexpectedly fails with the following output upon the