crew fails the imerge test

[Giorgos Keramidas]

Today's crew tip fails the imerge test on FreeBSD.  I'm running the test
suite on Solaris too as I'm posting this...

------------------------------------------------------------------------
System:		FreeBSD 7.0-CURRENT
Hg version:	ec70fd08e16c531f4ea6fbef8ff78970819f1247
Log:
------------------------------------------------------------------------
keramida at kobe:/home/keramida/cron.d$ sh mercurial-test.sh
2007-08-02 10:56:51 -- Gate repository is at /home/keramida/hg/mercurial/crew
2007-08-02 10:56:51 -- Creating temporary test workspace at /var/tmp
2007-08-02 10:56:51 -- Initializing test workspace at /var/tmp/hgtest-AlNg
2007-08-02 10:56:51 -- Pulling changesets from gate repo at /home/keramida/hg/mercurial/crew
pulling from /home/keramida/hg/mercurial/crew
requesting all changes
adding changesets
adding manifests
adding file changes
added 5055 changesets with 9540 changes to 673 files
(run 'hg update' to get a working copy)
2007-08-02 10:57:06 -- Gate tip is ec70fd08e16c531f4ea6fbef8ff78970819f1247
2007-08-02 10:57:06 -- Checking out changeset ec70fd08e16c531f4ea6fbef8ff78970819f1247
591 files updated, 0 files merged, 0 files removed, 0 files unresolved
2007-08-02 10:57:07 -- Running the Mercurial test suite.
2007-08-02 10:57:07 -- Extra run-tests.py flags: (none)
...............................................................................
ERROR: test-imerge output changed
--- Expected output
+++ Test output
@@ -28,21 +28,72 @@
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-merging e6da46716401 and 1c0a86e7db0d
-resolved:
-  foo
-all conflicts resolved
+Traceback (most recent call last):
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/mercurial/cmdutil.py", line 38, in runcatch
+    return dispatch(ui, args, argv0=argv0)
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/mercurial/cmdutil.py", line 379, in dispatch
+    ret = runcommand(ui, options, cmd, d)
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/mercurial/cmdutil.py", line 432, in runcommand
+    return checkargs()
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/mercurial/cmdutil.py", line 388, in checkargs
+    return cmdfunc()
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/mercurial/cmdutil.py", line 371, in <lambda>
+    d = lambda: func(ui, repo, *args, **cmdoptions)
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/hgext/imerge.py", line 332, in imerge
+    return dispatch(im, args, opts)
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/hgext/imerge.py", line 271, in dispatch
+    return func(im, *args)
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/hgext/imerge.py", line 198, in load
+    rc = im.unpickle(source)
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/hgext/imerge.py", line 188, in unpickle
+    return state.load(source)
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/hgext/imerge.py", line 48, in load
+    tf.extractall(self.im.repo.root)
+AttributeError: 'TarFile' object has no attribute 'extractall'
+** unknown exception encountered, details follow
+** report bug details to http://www.selenic.com/mercurial/bts
+** or mercurial at selenic.com
+** Mercurial Distributed SCM (version ec70fd08e16c)
+Traceback (most recent call last):
+  File "/var/tmp/hgtests.M_oSiM/install/bin/hg", line 11, in ?
+    mercurial.commands.run()
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/mercurial/commands.py", line 3141, in run
+    sys.exit(dispatch(sys.argv[1:], argv0=sys.argv[0]))
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/mercurial/commands.py", line 3138, in dispatch
+    return cmdutil.runcatch(u, args, argv0=argv0)
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/mercurial/cmdutil.py", line 38, in runcatch
+    return dispatch(ui, args, argv0=argv0)
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/mercurial/cmdutil.py", line 379, in dispatch
+    ret = runcommand(ui, options, cmd, d)
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/mercurial/cmdutil.py", line 432, in runcommand
+    return checkargs()
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/mercurial/cmdutil.py", line 388, in checkargs
+    return cmdfunc()
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/mercurial/cmdutil.py", line 371, in <lambda>
+    d = lambda: func(ui, repo, *args, **cmdoptions)
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/hgext/imerge.py", line 332, in imerge
+    return dispatch(im, args, opts)
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/hgext/imerge.py", line 271, in dispatch
+    return func(im, *args)
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/hgext/imerge.py", line 198, in load
+    rc = im.unpickle(source)
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/hgext/imerge.py", line 188, in unpickle
+    return state.load(source)
+  File "/var/tmp/hgtests.M_oSiM/install/lib/python/hgext/imerge.py", line 48, in load
+    tf.extractall(self.im.repo.root)
+AttributeError: 'TarFile' object has no attribute 'extractall'
+Exception exceptions.ImportError: 'No module named cStringIO' in <bound method lock.__del__ of <mercurial.lock.lock object at 0x28611e4c>> ignored
 foo
-changeset:   3:eaf80a943462
+bar
+changeset:   3:9674828ea988
 tag:         tip
-parent:      2:e6da46716401
-parent:      1:1c0a86e7db0d
+parent:      0:0aa0c251c2c6
 user:        test
 date:        Thu Jan 01 00:00:03 1970 +0000
-files:       foo
+files:       bar foo
 description:
 merged


 % nothing to merge
-abort: there is nothing to merge - use "hg update" instead
+abort: repo has 3 heads - please merge with an explicit rev
...................................................................................................
# Ran 178 tests, 0 skipped, 1 failed.
2007-08-02 11:05:13 -- Removing test workspace from /var/tmp/hgtest-AlNg
keramida at kobe:/home/keramida/cron.d$
------------------------------------------------------------------------