From: Ivo Alxneit <ivo.alxneit@psi.ch>
To: git <git@vger.kernel.org>
Subject: failing test with cogito
Date: Fri, 14 Oct 2005 15:32:47 +0200 [thread overview]
Message-ID: <200510141532.59897.ivo.alxneit@psi.ch> (raw)
[-- Attachment #1: Type: text/plain, Size: 1461 bytes --]
hi
i use
cogito
commit 19e07806612d8cea5c8e343709d567fb796e2bb3
git
commit d06b689a933f6d2130f8afdf1ac0ddb83eeb59ab
and the following tests fail for cogito (all tests pass in git)
*** t9200-merge.sh ***
* FAIL 17: merging branch2 to branch1 (automatic)
(cd branch1 && cg-merge </dev/null)
* FAIL 18: checking for correct merged content
(cmp branch1/brm expect)
* FAIL 23: checking for correct conflict content
(cmp brm-cleaned-up expect)
*** t9202-merge-on-dirty.sh ***
* FAIL 19: checking if we still have our local change
(cd branch1 && cg-status -w | grep -q "^M foo" && cmp foo foo-)
* FAIL 36: merging branch2 to branch1 (automatic)
(cd branch1 && cg-merge </dev/null)
* FAIL 37: checking if the working copy was touched by the merge
(cd branch1 && ! cmp brm brm-)
* FAIL 38: checking if we still have our local change
(cd branch1 && cg-status -w | grep -q "^M bar" && cmp bar bar-)
* FAIL 47: confirming that we have no uncommitted modifications
(cd branch1 && [ -z "$(git-diff-index -r $(cg-object-id -t))" ])
* FAIL 50: checking if the merge caused a conflict
(cd branch1 && grep "<<<" brm)
--
Dr. Ivo Alxneit
Laboratory for Solar Technology phone: +41 56 310 4092
Paul Scherrer Institute fax: +41 56 310 2688
CH-5232 Villigen http://solar.web.psi.ch
Switzerland gnupg key: 0x515E30C7
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
reply other threads:[~2005-10-14 13:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=200510141532.59897.ivo.alxneit@psi.ch \
--to=ivo.alxneit@psi.ch \
--cc=git@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).