[PATCH 06 of 10] tests: update test-merge1 to pass our import checker
Augie Fackler
raf at durin42.com
Mon Aug 28 10:55:57 EDT 2017
# HG changeset patch
# User Augie Fackler <raf at 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
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')
More information about the Mercurial-devel
mailing list