summaryrefslogtreecommitdiff
path: root/doc/bugs/Incorrect_merge___40__a_special_case__41__/comment_2_8b2a188696f46819f6e3f0e9660362d2._comment
blob: 39bb908772b6ed529b81265f15456758a101b299 (plain)
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
[[!comment format=mdwn
 username="https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg"
 nickname="Tim"
 subject="comment 2"
 date="2013-11-14T18:06:55Z"
 content="""
You were missing a: test/a$ git annex sync

This did the trick on my system
[[!format sh \"\"\"
#!/bin/sh
set -e
mkdir test
cd test
git init a

cd a
git annex init
git annex direct
touch firstfile
git annex add firstfile
git annex sync # think this was left out of recipe  # indeed it was

cd ..

git clone a b
cd b
git annex direct
echo bbbb > f
git annex add f
git annex sync || true  # why add a || true?
cd ../a
git annex sync
echo aaaa > f
git annex add f
git annex sync
cd ../b
rm f
git annex sync
ls
cd ../a
git annex sync
ls
\"\"\"]]
"""]]