* t1001-read-tree-m-2way.sh failed
@ 2006-04-20 13:01 Sven Verdoolaege
2006-04-20 13:10 ` Andreas Ericsson
0 siblings, 1 reply; 3+ messages in thread
From: Sven Verdoolaege @ 2006-04-20 13:01 UTC (permalink / raw)
To: git
*** t1001-read-tree-m-2way.sh ***
* FAIL 1: setup
echo frotz >frotz &&
echo nitfol >nitfol &&
cat bozbar-old >bozbar &&
echo rezrov >rezrov &&
echo yomin >yomin &&
git-update-index --add nitfol bozbar rezrov &&
treeH=`git-write-tree` &&
echo treeH $treeH &&
git-ls-tree $treeH &&
cat bozbar-new >bozbar &&
git-update-index --add frotz bozbar --force-remove rezrov &&
git-ls-files --stage >M.out &&
treeM=`git-write-tree` &&
echo treeM $treeM &&
git-ls-tree $treeM &&
git-diff-tree $treeH $treeM
* ok 2: 1, 2, 3 - no carry forward
* ok 3: 4 - carry forward local addition.
* ok 4: 5 - carry forward local addition.
* ok 5: 6 - local addition already has the same.
* ok 6: 7 - local addition already has the same.
* ok 7: 8 - conflicting addition.
* ok 8: 9 - conflicting addition.
* ok 9: 10 - path removed.
* ok 10: 11 - dirty path removed.
* ok 11: 12 - unmatching local changes being removed.
* ok 12: 13 - unmatching local changes being removed.
* ok 13: 14 - unchanged in two heads.
* ok 14: 15 - unchanged in two heads.
* ok 15: 16 - conflicting local change.
* ok 16: 17 - conflicting local change.
* ok 17: 18 - local change already having a good result.
* ok 18: 19 - local change already having a good result, further modified.
* ok 19: 20 - no local change, use new tree.
* ok 20: 21 - no local change, dirty cache.
* ok 21: 22 - local change cache updated.
* ok 22: DF vs DF/DF case setup.
* ok 23: DF vs DF/DF case test.
* failed 1 among 23 test(s)
skimo
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: t1001-read-tree-m-2way.sh failed
2006-04-20 13:01 t1001-read-tree-m-2way.sh failed Sven Verdoolaege
@ 2006-04-20 13:10 ` Andreas Ericsson
2006-04-20 13:53 ` Sven Verdoolaege
0 siblings, 1 reply; 3+ messages in thread
From: Andreas Ericsson @ 2006-04-20 13:10 UTC (permalink / raw)
To: skimo; +Cc: git
Platform?
Architecture?
git version?
Keyboard color?
This report is missing lots of info. Fill in the missing parts and
someone will almost certainly be able to help you.
Sven Verdoolaege wrote:
> *** t1001-read-tree-m-2way.sh ***
> * FAIL 1: setup
> echo frotz >frotz &&
> echo nitfol >nitfol &&
> cat bozbar-old >bozbar &&
> echo rezrov >rezrov &&
> echo yomin >yomin &&
> git-update-index --add nitfol bozbar rezrov &&
> treeH=`git-write-tree` &&
> echo treeH $treeH &&
> git-ls-tree $treeH &&
>
> cat bozbar-new >bozbar &&
> git-update-index --add frotz bozbar --force-remove rezrov &&
> git-ls-files --stage >M.out &&
> treeM=`git-write-tree` &&
> echo treeM $treeM &&
> git-ls-tree $treeM &&
> git-diff-tree $treeH $treeM
> * failed 1 among 23 test(s)
>
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: t1001-read-tree-m-2way.sh failed
2006-04-20 13:10 ` Andreas Ericsson
@ 2006-04-20 13:53 ` Sven Verdoolaege
0 siblings, 0 replies; 3+ messages in thread
From: Sven Verdoolaege @ 2006-04-20 13:53 UTC (permalink / raw)
To: Andreas Ericsson; +Cc: git
On Thu, Apr 20, 2006 at 03:10:07PM +0200, Andreas Ericsson wrote:
> Keyboard color?
I think "beige" comes closest.
In any case, it turns out that apparently make was confused
by the rename from diff.c to diff-lib.c.
After a make clean, everything was ok.
skimo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-04-20 13:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-20 13:01 t1001-read-tree-m-2way.sh failed Sven Verdoolaege
2006-04-20 13:10 ` Andreas Ericsson
2006-04-20 13:53 ` Sven Verdoolaege
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).