Package: git-core
Version: 1:1.5.2~rc2-1
Severity: serious
Hi,
your package failed to build from source.
Attached you can find the log of the failing test run manually with
--verbose
| Automatic build of git-core_1:1.5.2~rc2-1 on meitner by sbuild/hppa 98-farm
| Build started at 20070510-1357
| ******************************************************************************
| Checking available source versions...
| Fetching source files...
| Reading package lists...
| Building dependency tree...
| Need to get 1488kB of source archives.
| Get:1 http://ftp.de.debian.org experimental/main git-core 1:1.5.2~rc2-1 (dsc)
[796B]
| Get:2 http://ftp.de.debian.org experimental/main git-core 1:1.5.2~rc2-1 (tar)
[1380kB]
| Get:3 http://ftp.de.debian.org experimental/main git-core 1:1.5.2~rc2-1
(diff) [107kB]
| Fetched 1488kB in 5s (263kB/s)
| Download complete and in download only mode
| ** Using build dependencies supplied by package:
| Build-Depends: libz-dev, libcurl3-gnutls-dev | libcurl3-dev, asciidoc (>>
7.0.2-3), xmlto, libexpat1-dev, subversion, libsvn-perl | libsvn-core-perl,
unzip
| Checking for already installed source dependencies...
| libz-dev: missing
| No default version. Virtual package?
| libcurl3-gnutls-dev: missing
| No default version. Virtual package?
| libcurl3-dev: missing
| No default version. Virtual package?
| asciidoc: missing
| Using default version 7.1.2-2 (Priority: 500)
| xmlto: missing
| Using default version 0.0.18-5.1 (Priority: 500)
| libexpat1-dev: missing
| Using default version 1.95.8-3.4 (Priority: 500)
| subversion: missing
| Using default version 1.4.2dfsg1-2 (Priority: 500)
| libsvn-perl: missing
| Using default version 1.4.2dfsg1-2 (Priority: 500)
| libsvn-core-perl: missing
| No default version. Virtual package?
| unzip: missing
| Using default version 5.52-9 (Priority: 500)
| Checking for source dependency conflicts...
[...]
| *** 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)
| make[2]: *** [t6026-merge-attr.sh] Error 1
| make[2]: Leaving directory `/build/buildd/git-core-1.5.2~rc2/t'
| make[1]: *** [test] Error 2
| make[1]: Leaving directory `/build/buildd/git-core-1.5.2~rc2'
| make: *** [build-arch-stamp] Error 2
| ******************************************************************************
| Build finished at 20070510-1410
| FAILED [dpkg-buildpackage died]
Full build log(s):
http://experimental.ftbfs.de/build.php?&ver=1:1.5.2~rc2-1&pkg=git-core&arch=hppa
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
* expecting success:
for f in text binary union
do
echo Initial >$f && git add $f || break
done &&
test_tick &&
git commit -m Initial &&
git branch side &&
for f in text binary union
do
echo Master >>$f && git add $f || break
done &&
test_tick &&
git commit -m Master &&
git checkout side &&
for f in text binary union
do
echo Side >>$f && git add $f || break
done &&
test_tick &&
git commit -m Side &&
git tag anchor
Created initial commit 5f96ff8: Initial
3 files changed, 3 insertions(+), 0 deletions(-)
create mode 100644 binary
create mode 100644 text
create mode 100644 union
Created commit 5054610: Master
3 files changed, 3 insertions(+), 0 deletions(-)
Switched to branch "side"
Created commit 03d8861: Side
3 files changed, 3 insertions(+), 0 deletions(-)
* ok 1: setup
* expecting success:
{
echo "binary -merge"
echo "union merge=union"
} >.gitattributes &&
if git merge master
then
echo Gaah, should have conflicted
false
else
echo Ok, conflicted.
fi
Merging HEAD with master
Merging:
03d8861 Side
5054610 Master
found 1 common ancestor(s):
5f96ff8 Initial
Auto-merged binary
CONFLICT (content): Merge conflict in binary
Auto-merged text
CONFLICT (content): Merge conflict in text
Auto-merged union
Automatic merge failed; fix conflicts and then commit the result.
Ok, conflicted.
* ok 2: merge
* expecting success:
git ls-files -u | grep binary &&
git ls-files -u | grep text &&
! (git ls-files -u | grep union)
100644 a77fa514de2720c72c1a861de098595959a2c97a 1 binary
100644 fb25c069fdd4d47c6cf8d3a457b8f620064cba41 2 binary
100644 8950d9fdcf2dc4071be500e078831dbcfca693e1 3 binary
100644 a77fa514de2720c72c1a861de098595959a2c97a 1 text
100644 fb25c069fdd4d47c6cf8d3a457b8f620064cba41 2 text
100644 8950d9fdcf2dc4071be500e078831dbcfca693e1 3 text
* ok 3: check merge result in index
* expecting success:
git cat-file -p HEAD:binary >binary-orig &&
grep "<<<<<<<" text &&
cmp binary-orig binary &&
! grep "<<<<<<<" union &&
grep Master union &&
grep Side union
<<<<<<< HEAD:text
Master
Side
* ok 4: check merge result in working tree
* expecting success:
echo "* merge=union" >.gitattributes &&
echo "text merge=custom" >>.gitattributes &&
git reset --hard anchor &&
git config --replace-all \
merge.custom.driver "./custom-merge %O %A %B 0" &&
git config --replace-all \
merge.custom.name "custom merge driver for testing" &&
git merge master &&
cmp binary union &&
sed -e 1,3d text >check-1 &&
o=$(git-unpack-file master^:text) &&
a=$(git-unpack-file side^: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
HEAD is now at 03d8861... Side
Merging HEAD with master
Merging:
03d8861 Side
5054610 Master
found 1 common ancestor(s):
5f96ff8 Initial
Auto-merged binary
Auto-merged text
merging text using custom merge driver for testing
Auto-merged union
Merge made by recursive.
binary | 1 +
text | 9 +++++++++
union | 1 +
3 files changed, 11 insertions(+), 0 deletions(-)
* ok 5: custom merge backend
* expecting success:
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
HEAD is now at 03d8861... Side
fatal: Failed to execute internal merge
Merging HEAD with master
Merging:
03d8861 Side
5054610 Master
found 1 common ancestor(s):
5f96ff8 Initial
Auto-merged binary
Auto-merged text
merging text using custom merge driver for testing
Merge with strategy recursive failed.
Ok, conflicted
cmp: EOF on union
* 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)
