Added a comment: seems i'm not allowed to attach full logs.
This commit is contained in:
https://www.google.com/accounts/o8/id?id=AItOawkJafmCf-sg9_OM0pynFYM3AO4WCgJiaMI
admin
parent
e296b40ca6
commit
88fb081939
1 changed files with 188 additions and 0 deletions
|
|
@ -0,0 +1,188 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawkJafmCf-sg9_OM0pynFYM3AO4WCgJiaMI"
|
||||
nickname="Michele"
|
||||
subject="seems i'm not allowed to attach full logs."
|
||||
date="2013-11-23T16:06:17Z"
|
||||
content="""
|
||||
here's an excerpt (the context of FAIL), hopefully i've interpreted correctely the test begin message.
|
||||
|
||||
win7:
|
||||
|
||||
unannex (with copy): Detected a filesystem without fifo support.
|
||||
Disabling ssh connection caching.
|
||||
Detected a crippled filesystem.
|
||||
Enabling direct mode.
|
||||
get foo (merging origin/git-annex into git-annex...)
|
||||
(Recording state in git...)
|
||||
(from origin...)
|
||||
foo
|
||||
20 100% 0.00kB/s 0:00:00
|
||||
20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1)
|
||||
|
||||
sent 87 bytes received 31 bytes 236.00 bytes/sec
|
||||
total size is 20 speedup is 0.17
|
||||
ok
|
||||
(Recording state in git...)
|
||||
unannex foo
|
||||
git-annex: M:\gitannex.test\.t\tmprepo4\.git\annex\objects\6cd\e82\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77.map4432.tmp: MoveFileEx \"M:\\gitannex.test\\.t\\tmprepo4\\.git\\annex\\objects\\6cd\\e82\\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77\\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77.map4432.tmp\" \"M:\\gitannex.test\\.t\\tmprepo4\\.git\\annex\\objects\\6cd\\e82\\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77\\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77.map\": permission denied (Access is denied.)
|
||||
failed
|
||||
git-annex: unannex: 1 failed
|
||||
FAIL
|
||||
|
||||
conflict_resolution (mixed directory and file): Detected a filesystem without fifo support.
|
||||
Disabling ssh connection caching.
|
||||
Detected a crippled filesystem.
|
||||
Enabling direct mode.
|
||||
Detected a filesystem without fifo support.
|
||||
Disabling ssh connection caching.
|
||||
Detected a crippled filesystem.
|
||||
Enabling direct mode.
|
||||
add conflictor (checksum...) ok
|
||||
(Recording state in git...)
|
||||
(merging origin/git-annex origin/synced/git-annex into git-annex...)
|
||||
(Recording state in git...)
|
||||
commit
|
||||
ok
|
||||
pull origin bash.exe: warning: could not find /tmp, please create!
|
||||
|
||||
ok
|
||||
push origin bash.exe: warning: could not find /tmp, please create!
|
||||
To M:/gitannex.test/.t\repo
|
||||
32fb7c0..38147e0 git-annex -> synced/git-annex
|
||||
7684984..4116595 annex/direct/master -> synced/master
|
||||
|
||||
ok
|
||||
add conflictor/subfile (checksum...) ok
|
||||
(Recording state in git...)
|
||||
(merging origin/git-annex origin/synced/git-annex into git-annex...)
|
||||
(Recording state in git...)
|
||||
commit
|
||||
ok
|
||||
pull origin bash.exe: warning: could not find /tmp, please create!
|
||||
From M:/gitannex.test/.t\repo
|
||||
7684984..4116595 master -> origin/master
|
||||
32fb7c0..38147e0 synced/git-annex -> origin/synced/git-annex
|
||||
7684984..4116595 synced/master -> origin/synced/master
|
||||
Adding conflictor/subfile
|
||||
CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~refs_remotes_origin_synced_master
|
||||
Automatic merge failed; fix conflicts and then commit the result.
|
||||
Ignoring path ./conflictor.variant-cc12
|
||||
conflictor: needs merge
|
||||
[annex/direct/master 27c52e4] git-annex automatic merge conflict fix
|
||||
|
||||
|
||||
(Recording state in git...)
|
||||
|
||||
Merge conflict was automatically resolved; you may want to examine the result.
|
||||
ok
|
||||
(merging origin/synced/git-annex into git-annex...)
|
||||
(Recording state in git...)
|
||||
push origin bash.exe: warning: could not find /tmp, please create!
|
||||
To M:/gitannex.test/.t\repo
|
||||
38147e0..02916ee git-annex -> synced/git-annex
|
||||
4116595..27c52e4 annex/direct/master -> synced/master
|
||||
|
||||
ok
|
||||
commit
|
||||
ok
|
||||
pull r2 bash.exe: warning: could not find /tmp, please create!
|
||||
From ../../.t\tmprepo35
|
||||
* [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
|
||||
Updating 4116595..27c52e4
|
||||
Fast-forward
|
||||
conflictor | 1 -
|
||||
conflictor/subfile | 1 +
|
||||
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||
delete mode 120000 conflictor
|
||||
create mode 120000 conflictor/subfile
|
||||
Already up-to-date.
|
||||
|
||||
|
||||
|
||||
ok
|
||||
(merging r2/git-annex into git-annex...)
|
||||
FAIL
|
||||
|
||||
|
||||
windowsXP:
|
||||
|
||||
conflict_resolution (mixed directory and file): Detected a filesystem without fifo support.
|
||||
Disabling ssh connection caching.
|
||||
Detected a crippled filesystem.
|
||||
Enabling direct mode.
|
||||
Detected a filesystem without fifo support.
|
||||
Disabling ssh connection caching.
|
||||
Detected a crippled filesystem.
|
||||
Enabling direct mode.
|
||||
add conflictor (checksum...) ok
|
||||
(Recording state in git...)
|
||||
(merging origin/git-annex origin/synced/git-annex into git-annex...)
|
||||
(Recording state in git...)
|
||||
commit
|
||||
ok
|
||||
pull origin bash.exe: warning: could not find /tmp, please create!
|
||||
|
||||
ok
|
||||
push origin bash.exe: warning: could not find /tmp, please create!
|
||||
To C:/Documents and Settings/Silvia/.t\repo
|
||||
edd69f1..83c6a5a git-annex -> synced/git-annex
|
||||
bed393e..978ac14 annex/direct/master -> synced/master
|
||||
|
||||
ok
|
||||
add conflictor/subfile (checksum...) ok
|
||||
(Recording state in git...)
|
||||
(merging origin/git-annex origin/synced/git-annex into git-annex...)
|
||||
(Recording state in git...)
|
||||
commit
|
||||
ok
|
||||
pull origin bash.exe: warning: could not find /tmp, please create!
|
||||
From C:/Documents and Settings/Silvia/.t\repo
|
||||
bed393e..978ac14 master -> origin/master
|
||||
edd69f1..83c6a5a synced/git-annex -> origin/synced/git-annex
|
||||
bed393e..978ac14 synced/master -> origin/synced/master
|
||||
Adding conflictor/subfile
|
||||
CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~refs_remotes_origin_synced_master
|
||||
Automatic merge failed; fix conflicts and then commit the result.
|
||||
Ignoring path ./conflictor.variant-cc12
|
||||
conflictor: needs merge
|
||||
[annex/direct/master e3e39fc] git-annex automatic merge conflict fix
|
||||
|
||||
|
||||
(Recording state in git...)
|
||||
|
||||
Merge conflict was automatically resolved; you may want to examine the result.
|
||||
ok
|
||||
(merging origin/synced/git-annex into git-annex...)
|
||||
(Recording state in git...)
|
||||
push origin bash.exe: warning: could not find /tmp, please create!
|
||||
To C:/Documents and Settings/Silvia/.t\repo
|
||||
83c6a5a..e1a1678 git-annex -> synced/git-annex
|
||||
978ac14..e3e39fc annex/direct/master -> synced/master
|
||||
|
||||
ok
|
||||
commit
|
||||
ok
|
||||
pull r2 bash.exe: warning: could not find /tmp, please create!
|
||||
From ../../.t\tmprepo35
|
||||
* [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
|
||||
Updating 978ac14..e3e39fc
|
||||
Fast-forward
|
||||
conflictor | 1 -
|
||||
conflictor/subfile | 1 +
|
||||
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||
delete mode 120000 conflictor
|
||||
create mode 120000 conflictor/subfile
|
||||
Already up-to-date.
|
||||
|
||||
|
||||
|
||||
ok
|
||||
(merging r2/git-annex into git-annex...)
|
||||
FAIL
|
||||
"""]]
|
||||
Loading…
Reference in a new issue