Patchwork [06,of,10] tests: update test-merge1 to pass our import checker

login
register
mail settings
Submitter Augie Fackler
Date Aug. 28, 2017, 2:55 p.m.
Message ID <198590263d2e765f0ba5.1503932157@augie-macbookpro2.roam.corp.google.com>
Download mbox | patch
Permalink /patch/23417/
State Accepted
Headers show

Comments

Augie Fackler - Aug. 28, 2017, 2:55 p.m.
# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1503435523 14400
#      Tue Aug 22 16:58:43 2017 -0400
# Node ID 198590263d2e765f0ba50ec295962ca96d1d8313
# Parent  1a76ab57efe7ae6cea50119a6a3e06fcf5833a2a
tests: update test-merge1 to pass our import checker

Patch

diff --git a/tests/test-merge1.t b/tests/test-merge1.t
--- a/tests/test-merge1.t
+++ b/tests/test-merge1.t
@@ -340,9 +340,14 @@  aren't changed), even if none of mode, s
 isn't changed on the filesystem (see also issue4583).
 
   $ cat > $TESTTMP/abort.py <<EOF
+  > from __future__ import absolute_import
   > # emulate aborting before "recordupdates()". in this case, files
   > # are changed without updating dirstate
-  > from mercurial import extensions, merge, error
+  > from mercurial import (
+  >   error,
+  >   extensions,
+  >   merge,
+  > )
   > def applyupdates(orig, *args, **kwargs):
   >     orig(*args, **kwargs)
   >     raise error.Abort('intentional aborting')