crew fails the imerge test

Giorgos Keramidas keramida at ceid.upatras.gr
Thu Aug 2 08:21:48 CDT 2007


On 2007-08-02 14:03, Benoit Boissinot <bboissin at gmail.com> wrote:
> On 8/2/07, Giorgos Keramidas <keramida at ceid.upatras.gr> wrote:
> > Today's crew tip fails the imerge test on FreeBSD.  I'm running the test
> > suite on Solaris too as I'm posting this...
> >
> > +    tf.extractall(self.im.repo.root)
> > +AttributeError: 'TarFile' object has no attribute 'extractall'
>
> fixed in 56d48aed1f69,

Great, thank you!  All tests work fine on FreeBSD 7.0-CURRENT now:

# Ran 178 tests, 0 skipped, 0 failed.

There's still a failure of test-double-merge I'm trying to fix on
Solaris 10 Update 3:

% ERROR: test-double-merge output changed
% --- Expected output
% +++ Test output
% @@ -1,20 +1,1 @@
% -resolving manifests
% - overwrite None partial False
% - ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9
% - foo: versions differ -> m
% - foo: remote copied to bar -> m
% -copying foo to bar
% -merging foo and bar
% -my foo at 2092631ce82b+ other bar at 7731dad1c2b9 ancestor foo at 310fd17130da
% -merging foo
% -my foo at 2092631ce82b+ other foo at 7731dad1c2b9 ancestor foo at 310fd17130da
% -0 files updated, 2 files merged, 0 files removed, 0 files unresolved
% -(branch merge, don't forget to commit)
% --- foo --
% -line 0
% -line 1
% -line 2-1
% --- bar --
% -line 0
% -line 1
% -line 2-2
% +/tmp/hgtest-a4ZP/tests/test-double-merge: syntax error at line 18: `|' unexpected

It looks like there's a typo in line 18 of test-double-merge, which I
fixed with the patch I just mailed to mercurial-devel with "hg email":

[PATCH] tests: fix shell redirection typo in test-double-merge

I'm not sure yet why this particular test doens't fail with the /bin/sh
shell of FreeBSD, but that's probably not so important in the long run.

Thanks once again for the blazingly fast fix :-)



More information about the Mercurial-devel mailing list