Re: problems writing a regression test for issue 4647

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

Re: problems writing a regression test for issue 4647

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

problems writing a regression test for issue 4647

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