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 2012-10-31 11:43:49 -04:00
commit 2060c3e926
4 changed files with 110 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
doc/bugs/Building_fails:__Could_not_find_module___96__Data.XML.Types__39__.mdwn Normal file
View file

@ -0,0 +1,81 @@
What steps will reproduce the problem?
<pre>
dominik@Atlantis:/var/tmp$ git clone git://github.com/joeyh/git-annex.git
Cloning into 'git-annex'...
remote: Counting objects: 40841, done.
remote: Compressing objects: 100% (10648/10648), done.
remote: Total 40841 (delta 30135), reused 40669 (delta 29964)
Receiving objects: 100% (40841/40841), 9.21 MiB | 517 KiB/s, done.
Resolving deltas: 100% (30135/30135), done.
dominik@Atlantis:/var/tmp/git-annex$ cabal install --only-dependencies
Resolving dependencies...
All the requested packages are already installed:
Use --reinstall if you want to reinstall anyway.
dominik@Atlantis:/var/tmp/git-annex$ cabal configure
Resolving dependencies...
[ 1 of 21] Compiling Utility.FileSystemEncoding ( Utility/FileSystemEncoding.hs, dist/setup/Utility/FileSystemEncoding.o )
[ 2 of 21] Compiling Utility.Applicative ( Utility/Applicative.hs, dist/setup/Utility/Applicative.o )
[ 3 of 21] Compiling Utility.PartialPrelude ( Utility/PartialPrelude.hs, dist/setup/Utility/PartialPrelude.o )
[ 4 of 21] Compiling Utility.UserInfo ( Utility/UserInfo.hs, dist/setup/Utility/UserInfo.o )
[ 5 of 21] Compiling Utility.Monad ( Utility/Monad.hs, dist/setup/Utility/Monad.o )
[ 6 of 21] Compiling Utility.Path ( Utility/Path.hs, dist/setup/Utility/Path.o )
[ 7 of 21] Compiling Utility.OSX ( Utility/OSX.hs, dist/setup/Utility/OSX.o )
[ 8 of 21] Compiling Utility.Exception ( Utility/Exception.hs, dist/setup/Utility/Exception.o )
[ 9 of 21] Compiling Utility.TempFile ( Utility/TempFile.hs, dist/setup/Utility/TempFile.o )
[10 of 21] Compiling Utility.Misc ( Utility/Misc.hs, dist/setup/Utility/Misc.o )
[11 of 21] Compiling Utility.Process ( Utility/Process.hs, dist/setup/Utility/Process.o )
[12 of 21] Compiling Utility.FreeDesktop ( Utility/FreeDesktop.hs, dist/setup/Utility/FreeDesktop.o )
[13 of 21] Compiling Assistant.Install.AutoStart ( Assistant/Install/AutoStart.hs, dist/setup/Assistant/Install/AutoStart.o )
[14 of 21] Compiling Utility.SafeCommand ( Utility/SafeCommand.hs, dist/setup/Utility/SafeCommand.o )
[15 of 21] Compiling Utility.Directory ( Utility/Directory.hs, dist/setup/Utility/Directory.o )
[16 of 21] Compiling Common ( Common.hs, dist/setup/Common.o )
[17 of 21] Compiling Locations.UserConfig ( Locations/UserConfig.hs, dist/setup/Locations/UserConfig.o )
[18 of 21] Compiling Build.TestConfig ( Build/TestConfig.hs, dist/setup/Build/TestConfig.o )
[19 of 21] Compiling Build.Configure ( Build/Configure.hs, dist/setup/Build/Configure.o )
[20 of 21] Compiling Build.InstallDesktopFile ( Build/InstallDesktopFile.hs, dist/setup/Build/InstallDesktopFile.o )
[21 of 21] Compiling Main ( Setup.hs, dist/setup/Main.o )
Linking ./dist/setup/setup ...
checking version... 3.20121018
checking git... yes
checking git version... 1.7.10.4
checking cp -a... yes
checking cp -p... yes
checking cp --reflink=auto... yes
checking uuid generator... uuidgen
checking xargs -0... yes
checking rsync... yes
checking curl... yes
checking wget... yes
checking bup... no
checking gpg... yes
checking lsof... yes
checking ssh connection caching... yes
checking sha1... sha1sum
checking sha256... sha256sum
checking sha512... sha512sum
checking sha224... sha224sum
checking sha384... sha384sum
Configuring git-annex-3.20121018...
dominik@Atlantis:/var/tmp/git-annex$ cabal build
Building git-annex-3.20121018...
Preprocessing executable 'git-annex' for git-annex-3.20121018...
Assistant/XMPP.hs:18:8:
Could not find module `Data.XML.Types'
It is a member of the hidden package `xml-types-0.3.3'.
Perhaps you need to add `xml-types' to the build-depends in your .cabal file.
Use -v to see a list of the files searched for.
</pre>
What is the expected output? What do you see instead?
I exepect the current git HEAD to build without errors.
What version of git-annex are you using? On what operating system?
git-annex HEAD from git, Ubuntu 12.10
Please provide any additional information below.

2
doc/design/assistant/polls/prioritizing_special_remotes.mdwn
View file

@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
Help me prioritize my work: What special remote would you most like
to use with the git-annex assistant?
[[!poll open=yes 15 "Amazon S3 (done)" 9 "Amazon Glacier" 7 "Box.com" 59 "My phone (or MP3 player)" 15 "Tahoe-LAFS" 5 "OpenStack SWIFT" 21 "Google Drive"]]
[[!poll open=yes 15 "Amazon S3 (done)" 9 "Amazon Glacier" 7 "Box.com" 60 "My phone (or MP3 player)" 15 "Tahoe-LAFS" 5 "OpenStack SWIFT" 21 "Google Drive"]]
This poll is ordered with the options I consider easiest to build
listed first. Mostly because git-annex already supports them and they

8
doc/design/assistant/polls/prioritizing_special_remotes/comment_4_746006c3fffc7f917c4526fd688051f7._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnjrMQEhzd8xI81V9BL2jsKlNgVJLD7PKs"
nickname="Pankaj"
subject="Google Music as remote?"
date="2012-10-31T06:07:32Z"
content="""
A dropbox like folder which syncs with Google Music. Google Music allows uploading upto 20K songs. Also using git-annex , I can ensure that I dont need to store all the duplicate mp3 on my local drive. Only one copy of \"older music\" is \"arvhived\" on GMusic, whereas more recent songs are on my local drive.
"""]]

20
doc/forum/safely_dropping_git-annex_history.mdwn Normal file
View file

@ -0,0 +1,20 @@
the git-annex branch of a repository i've had running since 2010 has grown to unmanagable dimensions (5gb in a fresh clone of the git-annex branch, while the master branch has merely 40mb, part of which is due to checked-in files), resulting in git-annex-merges to take in the order of magnitude of 15 minutes. getting an initial clone of the git-annex branch (not the data) takes hours alone in the "remote: Counting objects" phase (admittedly, the origin server is limited in ram, so it spends its time swapping the git process back and forth).
is there a recommended way for how to reset the git-annex branch in a coordinated way? of course, this would have to happen on all copies of the repo at the same time.
the workflow i currently imagine is
* rename all copies of the repository (the_repo → the_repo-old, the_repo.git → the_repo-old.git)
* clone the old origin repository to a new origin with --single-branch. (this would be *the* oportunity to ``git filter-branch --prune-empty --index-filter 'git rm --cached --ignore-unmatch .git-annex -r' master`` as well, to get rid of commits of pre-whatever versions)
* ``git annex init`` on the master repository
* clone it to all the other copies and ``git annex init`` there
* set all the configuration options (untrusted repos etc) again
* either
* ``git annex reinject`` the files that are already present on the respective machines, or
* move the .git/annex/objects files over from the original locations, and use ``git annex fsck`` to make git-annex discover which files it already has, if that works. (i have numcopies=2, thus i'd dare to move instead of copy even when trying this out the first time. complete copies, even of partially checked out clones, will exceed the capacities of most clients)
my questions in that endeavor are:
* is there already a standard workflow for this?
* if not, will the above do the trick?
* can anything be done to avoid such problems in future?