* failing test with cogito
@ 2005-10-14 13:32 Ivo Alxneit
0 siblings, 0 replies; only message in thread
From: Ivo Alxneit @ 2005-10-14 13:32 UTC (permalink / raw)
To: git
[-- 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 --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-10-14 13:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-10-14 13:32 failing test with cogito Ivo Alxneit
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).