mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2015-06-15 13:27:33 -04:00
commit 1ec2c11536
2 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/forum/Does_the_windows_version_install_iStartSurf_malware__63__.mdwn Normal file
View file

@ -0,0 +1,3 @@
Hi, since I installed git-annex-windows through the link from the homepage I got iStartSurf, a really anoying malware. Could somebody ack the existence of iStartSurf in windows version? I use my windows seldom, usualy start only to receive updates. (and of coures to try out git-annex)
Zsolt

40
doc/forum/cannot_sync___39__unused__39___files.mdwn
View file

@ -4,32 +4,42 @@ I have setup a remote git-annex repository (ssh into some machine in our local n
When these client_repos change and do a "git annex sync <common_repo> --content", all the files from their laptops are successfully synchronised. The problem arises when:
(1) CLIENT_A creates somefile.csv
(2) CLIENT_A commits somefile.csv
i.e. git annex add somefile.csv
git commit -a -m "uploaded somefile.csv"
(3) CLIENT_A modifies somefile.csv
(4) CLIENT_A commits modified somefile.csv
i.e. git add somefile.csv
git commit -a -m "updated somefile.csv"
(5) CLIENT_A synchronises with common_repo
i.e. git annex sync <common_repo> --content
<ol>
<li>CLIENT_A creates somefile.csv</li>
<li>CLIENT_A commits somefile.csv
<br/>i.e.:
<br/>&nbsp;&nbsp;&nbsp;&nbsp;git annex add somefile.csv
<br/>&nbsp;&nbsp;&nbsp;&nbsp;git commit -a -m "uploaded somefile.csv"
</li>
<li>CLIENT_A modifies somefile.csv</li>
<li> CLIENT_A commits modified somefile.csv
<br/>i.e.:
<br/>&nbsp;&nbsp;&nbsp;&nbsp;git add somefile.csv
<br/>&nbsp;&nbsp;&nbsp;&nbsp;git commit -a -m "updated somefile.csv"
</li>
<li>CLIENT_A synchronises with common_repo
<br/>i.e.: git annex sync <common_repo> --content
</li>
</ol>
If I check the .git/annex/objects of common_repo, I can't seem to find a copy of the unmodified somefile.csv. It only has a copy of the latest somefile.csv.
This is problematic if one client tries to checkout a revision of the project that uses the original somefile.csv.
I learned that I can change the preferred content of git-annex. So, the appropriate preset for common_repo seemed to be "backup". After running the commands in common_repo:
git annex wanted . standard
git annex group . backup
<blockquote>
git annex wanted . standard<br/>
git annex group . backup
</blockquote>
I've done another test of the scenario above, and common_repo is still missing the previous revision of the file!! The preferred file content of common_repo should be "include=* or unused". In my case, the previous version of somefile.csv will probably fall in the "unused" category. But I still cannot find it.
A workaround is using two commands from the client(s):
git annex copy --to <common_repo> --all
git annex sync <common_repo> --content
<blockquote>
git annex copy --to <common_repo> --all<br/>
git annex sync <common_repo> --content
</blockquote>
But I can imagine my users forgetting to run 'copy' and my repo will go to shit over time.
Any ideas why I can't synchronise 'unused' files?