Patchwork [hglib] tests: adjust test-merge for mercurial 3.7

login
register
mail settings
Submitter Julien Cristau
Date Feb. 19, 2016, 6:25 p.m.
Message ID <c391c32f600461ccac39.1455906312@betterave.cristau.org>
Download mbox | patch
Permalink /patch/13267/
State Accepted
Delegated to: Matt Mackall
Headers show

Comments

Julien Cristau - Feb. 19, 2016, 6:25 p.m.
# HG changeset patch
# User Julien Cristau <julien.cristau@logilab.fr>
# Date 1455905790 -3600
#      Fri Feb 19 19:16:30 2016 +0100
# Node ID c391c32f600461ccac39ae4f69c0480bf8b5e9c5
# Parent  028f66e8e3ca2da74dfb2cfa1802af5320349e82
tests: adjust test-merge for mercurial 3.7

As of changeset 88d5db4b155c, the noninteractive handler for merge
leaves conflicting files unresolved.
Yuya Nishihara - Feb. 20, 2016, 9:35 a.m.
On Fri, 19 Feb 2016 19:25:12 +0100, Julien Cristau wrote:
> # HG changeset patch
> # User Julien Cristau <julien.cristau@logilab.fr>
> # Date 1455905790 -3600
> #      Fri Feb 19 19:16:30 2016 +0100
> # Node ID c391c32f600461ccac39ae4f69c0480bf8b5e9c5
> # Parent  028f66e8e3ca2da74dfb2cfa1802af5320349e82
> tests: adjust test-merge for mercurial 3.7
> 
> As of changeset 88d5db4b155c, the noninteractive handler for merge
> leaves conflicting files unresolved.

Looks good to me, thanks!
Pierre-Yves David - Feb. 26, 2016, 6:01 p.m.
On 02/20/2016 10:35 AM, Yuya Nishihara wrote:
> On Fri, 19 Feb 2016 19:25:12 +0100, Julien Cristau wrote:
>> # HG changeset patch
>> # User Julien Cristau <julien.cristau@logilab.fr>
>> # Date 1455905790 -3600
>> #      Fri Feb 19 19:16:30 2016 +0100
>> # Node ID c391c32f600461ccac39ae4f69c0480bf8b5e9c5
>> # Parent  028f66e8e3ca2da74dfb2cfa1802af5320349e82
>> tests: adjust test-merge for mercurial 3.7
>>
>> As of changeset 88d5db4b155c, the noninteractive handler for merge
>> leaves conflicting files unresolved.
>
> Looks good to me, thanks!

Matt, this patch have been on the list for a week, I think you are the 
only one with push access to the hglib. Can you take care of it?

Cheers,
Matt Mackall - March 2, 2016, 12:08 a.m.
On Fri, 2016-02-19 at 19:25 +0100, Julien Cristau wrote:
> # HG changeset patch
> # User Julien Cristau <julien.cristau@logilab.fr>
> # Date 1455905790 -3600
> #      Fri Feb 19 19:16:30 2016 +0100
> # Node ID c391c32f600461ccac39ae4f69c0480bf8b5e9c5
> # Parent  028f66e8e3ca2da74dfb2cfa1802af5320349e82
> tests: adjust test-merge for mercurial 3.7

Queued for hglib, thanks.

-- 
Mathematics is the supreme nostalgia of our time.

Patch

diff --git a/tests/test-merge.py b/tests/test-merge.py
--- a/tests/test-merge.py
+++ b/tests/test-merge.py
@@ -42,7 +42,12 @@  class test_merge(common.basetest):
         self.client.remove(b('a'))
         rev, node = self.client.commit(b('remove'))
 
-        self.client.merge(cb=hglib.merge.handlers.noninteractive)
+        if self.client.version >= (3, 7):
+            self.assertRaises(hglib.error.CommandError,
+                self.client.merge,
+                cb=hglib.merge.handlers.noninteractive)
+        else:
+            self.client.merge(cb=hglib.merge.handlers.noninteractive)
 
         diff = b("diff -r ") + node[:12] + b(""" a
 --- /dev/null