Bug#429389: FTBFS on hppa in tests

2007-06-18 Thread Gerrit Pape 
On Sun, Jun 17, 2007 at 08:47:53PM +0200, Andreas Barth wrote:
> Package: git-core
> Severity: serious
> Version: 1:1.5.2.1-1
> 
> Hi,
> 
> this package FTBFS on hppa, please see
> http://buildd.debian.org/fetch.cgi?&pkg=git-core&ver=1%3A1.5.2.1-1&arch=hppa&stamp=1180881720&file=log

Hi, see
 http://bugs.debian.org/422849
 http://bugs.debian.org/423185
 ->
 http://bugs.debian.org/427907
 http://bugs.debian.org/427398

Regards, Gerrit.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Bug#429389: FTBFS on hppa in tests

2007-06-17 Thread Andreas Barth 
Package: git-core
Severity: serious
Version: 1:1.5.2.1-1

Hi,

this package FTBFS on hppa, please see
http://buildd.debian.org/fetch.cgi?&pkg=git-core&ver=1%3A1.5.2.1-1&arch=hppa&stamp=1180881720&file=log
for the full build log:
*** t6026-merge-attr.sh ***
*   ok 1: setup
*   ok 2: merge
*   ok 3: check merge result in index
*   ok 4: check merge result in working tree
*   ok 5: custom merge backend
* FAIL 6: custom merge backend


git reset --hard anchor &&
git config --replace-all \
merge.custom.driver "./custom-merge %O %A %B 1" &&
git config --replace-all \
merge.custom.name "custom merge driver for testing" &&

if git merge master
then
echo "Eh? should have conflicted"
false
else
echo "Ok, conflicted"
fi &&

cmp binary union &&
sed -e 1,3d text >check-1 &&
o=$(git-unpack-file master^:text) &&
a=$(git-unpack-file anchor:text) &&
b=$(git-unpack-file master:text) &&
sh -c "./custom-merge $o $a $b 0" &&
sed -e 1,3d $a >check-2 &&
cmp check-1 check-2 &&
rm -f $o $a $b

* failed 1 among 6 test(s)

Cheers,
Andi
-- 
  http://home.arcor.de/andreas-barth/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]