pijul_org / pijul

#363 infinite non-deterministic loop in output_file

Opened by FlorentBecker, on February 27, 2019
FlorentBecker commented on February 27, 2019

When running tests/cases/edit_sides_of_conflict.bats with the current master, the first pijul pull runs into an infinite loop, seemingly building an ever-growing conflict in output_file. The test (and a bunch of others) then never terminates.

pmeunier commented on February 27, 2019

I just pushed a number of patches that make all the tests pass again. The behaviour of nested conflicts changed for something that is not as satisfactory, but that avoids problems with the horrible graph examples we've seen recently.