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
|
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o"
nickname="Justin"
subject="comment 3"
date="2014-01-29T18:43:07Z"
content="""
Here is the relevant portion of the test output. Sorry for getting caught up in my manual troubleshooting and not providing this info earlier.
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.62 KiB | 0 bytes/s, done.
Total 16 (delta 2), reused 0 (delta 0)
To c:/Users/geibeljt/annex/.t\repo
5a1abd2..b0de6d7 git-annex -> synced/git-annex
4539cc8..af0b4de 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 2), reused 0 (delta 0)
Unpacking objects: 100% (16/16), done.
From c:/Users/geibeljt/annex/.t\repo
4539cc8..af0b4de master -> origin/master
5a1abd2..b0de6d7 synced/git-annex -> origin/synced/git-annex
4539cc8..af0b4de 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 7b21326] 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
b0de6d7..b64838f git-annex -> synced/git-annex
af0b4de..7b21326 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 af0b4de..7b21326
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
git-annex: c:\Users\geibeljt\annex\.t\tmprepo37\.git\annex\merge\conflictor: renameFile: inappropriate type (i
s a directory)
failed
push origin
Counting objects: 29, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (15/15), done.
Writing objects: 100% (19/19), 1.71 KiB | 0 bytes/s, done.
Total 19 (delta 5), reused 0 (delta 0)
To c:/Users/geibeljt/annex/.t\repo
b64838f..0c094c8 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
"""]]
|
