import-checker: backout 40f79b9a2cc8 (issue4129)
This patch backs out 40f79b9a2cc8, which caused test-module-imports.t to
be skipped when the test was run using virtualenv. Since the test now
passes when using virtualenv, the skip is no longer necessary.
Test update logic when there are renames
Update with local changes across a file rename
$ hg init
$ echo a > a
$ hg add a
$ hg ci -m a
$ hg mv a b
$ hg ci -m rename
$ echo b > b
$ hg ci -m change
$ hg up -q 0
$ echo c > a
$ hg up
merging a and b to b
warning: conflicts during merge.
merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]