Failing test-merge-tools

[Paul Franz]

Yup and under Mac OS X the File Merge utility is popping up.

Paul Franz

Sent from my iPhone

On Feb 10, 2009, at 9:16 AM, Christian Ebert <blacktrash at gmx.net> wrote:

> * Mads Kiilerich on Tuesday, February 10, 2009 at 14:58:22 +0100
>> Dirkjan Ochtman wrote:
>>> I've been seeing a bunch of failures in test-merge-tools, both on my
>>> own server and on some of the build slaves. Mads, could these have  
>>> to
>>> do with your recent changes? Can you see what's up?
>>>
>>> http://builds.xavamedia.nl/builders/paulf-nbsd/builds/45/steps/test/logs/stdio
>>
>> The test uses the "tac" command. That isn't available on netbsd?
>
> FWIW, it's not available on MacOS X either:
>
> ERROR: test-merge-tools output changed
> --- Expected output
> +++ Test output
> @@ -182,12 +182,13 @@
> true.executable=cat
> # hg update -C 1
> # hg merge -r 2 --config merge-patterns.f=tac
> -space
> -revision 1
> -space
> -revision 0
> -space
> -revision 2
> +couldn't find merge tool tac specified for f
> +revision 1
> +space
> +revision 0
> +space
> +revision 2
> +space
> merging f
> 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
> (branch merge, don't forget to commit
>
>
> c
> -- 
> \black\trash movie    _C O W B O Y_  _C A N O E_  _C O M A_
> Ein deutscher Western/A German Western
> -->> http://www.blacktrash.org/underdogma/ccc.html
> -->> http://www.blacktrash.org/underdogma/ccc-en.html
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel