Source: git-annex
Version: 5.20141125
Severity: normal
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
when I tried to build git-annex via sbuild (in order to NMU #786659)
the build failed:
conflict resolution: On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
- From ../../.t/tmprepo1
* [new branch] annex/direct/master -> r2/annex/direct/master
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
Auto-merging conflictor
CONFLICT (add/add): Merge conflict in conflictor
Automatic merge failed; fix conflicts and then commit the result.
conflictor: needs merge
fatal: Unable to read current working directory: No such file or directory
fatal: Unable to read current working directory: No such file or directory
FAIL (0.36s)
sync failed
conflict resolution movein regression: On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
- From ../../.t/tmprepo1
* [new branch] annex/direct/master -> r2/annex/direct/master
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
To ../../.t/tmprepo1
* [new branch] git-annex -> synced/git-annex
* [new branch] annex/direct/master -> synced/master
Auto-merging foo
CONFLICT (content): Merge conflict in foo
Automatic merge failed; fix conflicts and then commit the result.
foo: needs merge
fatal: Unable to read current working directory: No such file or directory
fatal: Unable to read current working directory: No such file or directory
FAIL (0.41s)
sync failed in r2
conflict resolution (mixed directory and file): On branch master
nothing to commit, working directory clean
On branch master
nothing to commit, working directory clean
- From ../../.t/tmprepo1
* [new branch] annex/direct/master -> r2/annex/direct/master
* [new branch] git-annex -> r2/git-annex
* [new branch] master -> r2/master
* [new branch] synced/master -> r2/synced/master
Adding conflictor/subfile
CONFLICT (file/directory): There is a directory with name conflictor in
refs/remotes/r2/annex/direct/master. Adding conflictor as conflictor~HEAD
Automatic merge failed; fix conflicts and then commit the result.
conflictor: needs merge
fatal: Unable to read current working directory: No such file or directory
fatal: Unable to read current working directory: No such file or directory
FAIL (0.37s)
[..]
7 out of 134 tests failed (45.31s)
(This could be due to a bug in git-annex, or an incompatability
with utilities, such as git, installed on this system.)
Any ideas?
Joachim
- -- System Information:
Debian Release: stretch/sid
APT prefers unstable
APT policy: (500, 'unstable'), (101, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.0.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEARECAAYFAlWH5KEACgkQ9ijrk0dDIGxwKgCfTVDrhVl64QDWqJCpGhn85CM/
HGgAoKeYYallzbf4IxSFr926f1emsdmH
=zpaT
-----END PGP SIGNATURE-----
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
