[PATCH] tests: fix test-git-import.out
Giorgos Keramidas
keramida at ceid.upatras.gr
Sun Jul 15 06:51:35 CDT 2007
On 2007-07-15 05:13, "Alexis S. L. Carvalho" <alexis at cecm.usp.br> wrote:
> Thus spake Giorgos Keramidas:
> > # HG changeset patch
> > # User Giorgos Keramidas <keramida at ceid.upatras.gr>
> > # Date 1184469512 -10800
> > # Node ID 8ed67de0453880e6a160877f58969e196087b4c1
> > # Parent da8640113b5a7e495d7e8adb4c0d90eea64d08c5
> > tests: fix test-git-import.out
> >
> > diff --git a/tests/test-git-import.out b/tests/test-git-import.out
> > --- a/tests/test-git-import.out
> > +++ b/tests/test-git-import.out
> > @@ -62,4 +62,3 @@ a874b471193996e7cb034bb301cac7bdaf3e3f46
> > a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2
> > % filenames with spaces
> > applying patch from stdin
> > -foo
>
> This looks like a problem with your patch(1) - or at least a difference
> from the GNU version. AFAICT, to correctly detect filenames with
> spaces, GNU patch expects a line like "+++ file name<TAB>date". The
> date is optional, but the <TAB> is necessary.
>
> With version 826659bd8053 we've started adding a trailing <TAB> to these
> lines when there're spaces in the file name - that test is testing
> whether patch applied the patch to the correct file ("foo" is the only
> line in the resulting "foo bar" file).
Ah, I see now! For some reason I failed to see the `cat "foo bar"' line
at the end of the original test script. I'll try to blame sleepiness :P
Ignore this changeset then. I'll revert it locally, and try to find out
why /usr/bin/patch on FreeBSD doesn't work this way.
Thanks for the explanation :-)
More information about the Mercurial-devel
mailing list