Re: [ANNOUNCE] Cogito-0.11.3

From: Konstantin Antselovich <konstantin@antselovich.com>
Date: Jun 9, 2005, 10:10 UTC
Message-ID: <42A81584.90605@antselovich.com>
In-Reply-To: <20050609091909.GF29665@pasky.ji.cz>

Petr Baudis wrote:

Show 10 quoted lines

>   Hello,
> 
>   it turned out that Cogito was so broken w.r.t. three-way merging that
> I had to really release a bugfix version. So this version contains some
> cleanups of the merge script, some more portability fixes (it actually
> runs on Debian old stable now!), and especially few bugfixes - cg-log
> works with individual files passed to it now, and merging should
> hopefully work correctly now too.
> 
>   You know what to do. :-)

Hi Petr,

I have updated to Cogito-0.11.3, it compiles and runs but make test returns multiple error messages (see below)

Rgds, Konstantin

*** t6001-rev-list-merge-order.sh ***
fatal: merge order sort unsupported, OpenSSL not linked
fatal: merge order sort unsupported, OpenSSL not linked
*   ok 1: Testing that the rev-list has correct number of entries
* FAIL 2: Testing that --merge-order produces the correct result diff
expected-merge-order actual-merge-order
*   ok 3: Testing that --merge-order produces as many or fewer
discontinuities
fatal: merge order sort unsupported, OpenSSL not linked
* FAIL 4: Testing multiple heads diff expected-merge-order-1
actual-merge-order-1
fatal: merge order sort unsupported, OpenSSL not linked
* FAIL 5: Testing stop diff expected-merge-order-2 actual-merge-order-2
fatal: merge order sort unsupported, OpenSSL not linked
* FAIL 6: Testing stop in linear epoch diff expected-merge-order-3
actual-merge-order-3
fatal: merge order sort unsupported, OpenSSL not linked
* FAIL 7: Testing start in linear epoch, stop after non-linear epoch
diff expected-merge-order-4 actual-merge-order-4
* FAIL 8: Testing duplicated start arguments diff expected-merge-order-4
actual-merge-order-5
* FAIL 9: Testing exclusion near merge git-rev-list --merge-order $a4
^$c3 2>/dev/null
* failed 7 among 9 test(s)
make[1]: *** [all] Error 1
make[1]: Leaving directory `/home/konstantin/git/cogito/t'
make: *** [test] Error 2

-- 
Konstantin Antselovich
mailto: konstantin@antselovich.com
http://konstantin.antselovich.com