1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
|
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o"
nickname="Justin"
subject="comment 7"
date="2014-01-30T16:02:08Z"
content="""
Alright, I've grabbed the latest autobuild and have tested again with 5.20140130-gcb99900. Back to failing just this one test case. Compared to my last two comments, the test appears to be getting further along before failing.
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 ok
(Recording state in git...)
(merging origin/git-annex origin/synced/git-annex into git-annex...)
(Recording state in git...)
commit ok
pull origin
ok
push origin
Counting objects: 21, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (13/13), done.
Writing objects: 100% (16/16), 1.66 KiB | 0 bytes/s, done.
Total 16 (delta 1), reused 0 (delta 0)
To c:/Users/geibeljt/annex/.t\repo
dafdb0b..2d106aa git-annex -> synced/git-annex
688224a..18c2edb annex/direct/master -> synced/master
ok
add conflictor/subfile ok
(Recording state in git...)
(merging origin/git-annex origin/synced/git-annex into git-annex...)
(Recording state in git...)
commit ok
pull origin
remote: Counting objects: 21, done.
remote: Compressing objects: 100% (13/13), done.
remote: Total 16 (delta 1), reused 0 (delta 0)
Unpacking objects: 100% (16/16), done.
From c:/Users/geibeljt/annex/.t\repo
688224a..18c2edb master -> origin/master
dafdb0b..2d106aa synced/git-annex -> origin/synced/git-annex
688224a..18c2edb 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.
(Recording state in git...)
conflictor: needs merge
[annex/direct/master 5026450] git-annex automatic merge conflict fix
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
Counting objects: 32, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (19/19), done.
Writing objects: 100% (23/23), 2.18 KiB | 0 bytes/s, done.
Total 23 (delta 7), reused 0 (delta 0)
To c:/Users/geibeljt/annex/.t\repo
2d106aa..aca0d04 git-annex -> synced/git-annex
18c2edb..5026450 annex/direct/master -> synced/master
ok
commit ok
pull r2
remote: Counting objects: 32, done.
remote: Compressing objects: 100% (19/19), done.
remote: Total 23 (delta 7), reused 0 (delta 0)
Unpacking objects: 100% (23/23), done.
From ../../.t\tmprepo36
* [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 18c2edb..5026450
Fast-forward
conflictor | 1 -
conflictor.variant-cc12 | 1 +
conflictor/subfile | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
delete mode 120000 conflictor
create mode 120000 conflictor.variant-cc12
create mode 120000 conflictor/subfile
Already up-to-date.
ok
(merging r2/git-annex into git-annex...)
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 ok
(Recording state in git...)
(merging origin/git-annex origin/synced/git-annex into git-annex...)
(Recording state in git...)
commit ok
pull origin
Adding conflictor/subfile
CONFLICT (file/directory): There is a directory with name conflictor in refs/remotes/origin/synced/master. Add
ing conflictor as conflictor~HEAD
Automatic merge failed; fix conflicts and then commit the result.
conflictor: needs merge
(Recording state in git...)
[annex/direct/master 82abd2f] git-annex automatic merge conflict fix
Merge conflict was automatically resolved; you may want to examine the result.
ok
push origin
Counting objects: 32, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (17/17), done.
Writing objects: 100% (22/22), 1.95 KiB | 0 bytes/s, done.
Total 22 (delta 7), reused 0 (delta 0)
To c:/Users/geibeljt/annex/.t\repo
aca0d04..9d475c9 git-annex -> synced/git-annex
5026450..82abd2f annex/direct/master -> synced/master
ok
add conflictor/subfile ok
(Recording state in git...)
(merging origin/git-annex origin/synced/git-annex into git-annex...)
(Recording state in git...)
commit ok
pull origin
remote: Counting objects: 32, done.
remote: Compressing objects: 100% (17/17), done.
remote: Total 22 (delta 7), reused 0 (delta 0)
Unpacking objects: 100% (22/22), done.
From c:/Users/geibeljt/annex/.t\repo
5026450..82abd2f master -> origin/master
aca0d04..9d475c9 synced/git-annex -> origin/synced/git-annex
5026450..82abd2f synced/master -> origin/synced/master
Auto-merging conflictor/subfile
CONFLICT (add/add): Merge conflict in conflictor/subfile
Automatic merge failed; fix conflicts and then commit the result.
failed
(merging origin/synced/git-annex into git-annex...)
(Recording state in git...)
push origin
Counting objects: 34, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (17/17), done.
Writing objects: 100% (22/22), 2.05 KiB | 0 bytes/s, done.
Total 22 (delta 5), reused 0 (delta 0)
To c:/Users/geibeljt/annex/.t\repo
9d475c9..13a0faa git-annex -> synced/git-annex
! [rejected] annex/direct/master -> synced/master (non-fast-forward)
error: failed to push some refs to 'c:/Users/geibeljt/annex/.t\repo'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Pushing to origin failed.
(non-fast-forward problems can be solved by setting receive.denyNonFastforwards to false in the remote's git
config)
failed
git-annex: sync: 2 failed
FAIL
"""]]
|
