On Sat, 13 Feb 2016 19:00:54 +0100, Julien Cristau wrote: > against hg 3.7.1, hglib tests fail with > > ====================================================================== > ERROR: test_merge_prompt_noninteractive (tests.test-merge.test_merge) > ---------------------------------------------------------------------- > Traceback (most recent call last): > File "/<<PKGBUILDDIR>>/tests/test-merge.py", line 45, in > test_merge_prompt_noninteractive > self.client.merge(cb=hglib.merge.handlers.noninteractive) > File "/<<PKGBUILDDIR>>/hglib/client.py", line 1073, in merge > self.rawcommand(args, prompt=prompt) > File "/<<PKGBUILDDIR>>/hglib/client.py", line 183, in rawcommand > raise error.CommandError(args, ret, out, err) > CommandError: (1, "remote changed a which local deleted\nuse (c)hanged > version, leave (d)eleted, or leave (u)nresolved? u\n0 files updated, 0 files > merged, 0 files removed, 1 files unresolved\nuse 'hg resolve' to retry > unresolved file merges or 'hg update -C .' to abandon", '') > > ---------------------------------------------------------------------- > > I guess this is related to the following commit which changed the default > behaviour for hg merge: > > changeset: 27166:88d5db4b155c > user: Siddharth Agarwal <s...@fb.com> > date: Tue Dec 01 09:48:38 2015 -0800 > summary: filemerge: default regular prompts to 'leave unresolved' (BC) > > What should hglib do in that case?
I think the hglib test needs to be updated. '-y' should pick the default, which is "leave unresolved" since hg 3.7.
