From: Konstantin Antselovich <konstantin@antselovich.com>
To: Petr Baudis <pasky@ucw.cz>
Cc: git@vger.kernel.org
Subject: Re: [ANNOUNCE] Cogito-0.11.3
Date: Thu, 09 Jun 2005 03:10:12 -0700 [thread overview]
Message-ID: <42A81584.90605@antselovich.com> (raw)
In-Reply-To: <20050609091909.GF29665@pasky.ji.cz>
Petr Baudis wrote:
> 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
next prev parent reply other threads:[~2005-06-09 10:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-09 9:19 [ANNOUNCE] Cogito-0.11.3 Petr Baudis
2005-06-09 10:10 ` Konstantin Antselovich [this message]
2005-06-09 13:07 ` Dan Holmsand
2005-06-09 20:55 ` Chris Wright
2005-06-09 21:06 ` Chris Wright
2005-06-09 3:40 ` [PATCH] Fix cogito handling of timezones Frank Sorenson
2005-06-09 8:29 ` Petr Baudis
2005-06-09 14:20 ` Frank Sorenson
2005-06-10 22:19 ` Petr Baudis
2005-06-09 21:40 ` [COGITO PATCH] value too great for base (error token is "-0800") Pavel Roskin
2005-06-09 11:19 ` [PATCH 3/6] Make showdate use "Linus format" Dan Holmsand
2005-06-10 22:59 ` Petr Baudis
2005-06-11 8:28 ` Dan Holmsand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=42A81584.90605@antselovich.com \
--to=konstantin@antselovich.com \
--cc=git@vger.kernel.org \
--cc=pasky@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.