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-09-19 12:01:26 -04:00
commit 08fa128c2a
4 changed files with 52 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

32
doc/bugs/git_defunct_processes___40__child_of_git-annex_assistant__41__.mdwn Normal file
View file

@ -0,0 +1,32 @@
What steps will reproduce the problem?
run git annex assistant, add a file, which is picked up and pushed by the assistant.
What is the expected output? What do you see instead?
a ps -ef shows a large number of defunct git processes.. for example:
<pre>
nelg 9622 1 0 02:01 ? 00:00:01 git-annex assistant
nelg 9637 9622 0 02:01 ? 00:00:00 git --git-dir=/home/nelg/Downloads/test2/.git --work-tree=/home/nelg/Downloads/test2 cat-file --batch
nelg 12080 9622 0 02:19 ? 00:00:00 [git] &lt;defunct&gt;
nelg 12082 9622 0 02:19 ? 00:00:00 [git] &lt;defunct&gt;
nelg 12083 9622 0 02:19 ? 00:00:00 [git] &lt;defunct&gt;
nelg 12084 9622 0 02:19 ? 00:00:00 [git] &lt;defunct&gt;
-----
</pre>
What version of git-annex are you using? On what operating system?
Compiled git annex from git (cbcd208d158f8e42dda03a5eeaf1bac21045a140), on Mandriva 2010.2, 32 bit, using ghc-7.4.1.
git version 1.7.1
Please provide any additional information below.
I also found that the version of git I have does not support the option: --allow-empty-message
So, suggest that if the version of git installed is an older version, that the params in Assistant/Threads/Committer.hs
are changed to [ Param "-m", Param "git assistant".... or something like that.
I have done this on my copy for testing it.
For testing, I am also using two repositories on the same computer. I set this up from the command line, as the web app does not seem to support syncing to two different git folders on the same computer.

8
doc/bugs/pasting_into_annex_on_OSX/comment_2_f1b58adfec179b75c1fc2bf578a3b5c4._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://www.davidhaslem.com/"
nickname="David"
subject="comment 2"
date="2012-09-18T22:49:09Z"
content="""
Exact error message is: \"The operation can’t be completed because you don’t have permission to access some of the items.\" Looks like it starts symlinking and committing before the file is fully copied over.
"""]]

11
doc/design/assistant/desymlink/comment_1_f1bfe250b7f872359f7075998b6e42e3._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawn-KDr_Z4CMkjS0v_TxQ08SzAB5ecHG3K0"
nickname="Glen"
subject="Modifying files in a folder watched by assistant"
date="2012-09-19T14:18:54Z"
content="""
I think this feature is really important. For my use cases, if I can't modify files that are in the folder that is kept in sync, then I would just use rsync or manually keep copies on multiple systems..
I might be missing something, but tried a git annex unlock on the file, but if the assistant is running, it seems to revert this back.
"""]]

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 13 "Amazon S3" 5 "Box.com" 41 "My phone (or MP3 player)" 2 "Tahoe-LAFS" 3 "OpenStack SWIFT" 10 "Google Drive" 7 "Amazon Glacier"]]
[[!poll open=yes 13 "Amazon S3" 5 "Box.com" 42 "My phone (or MP3 player)" 3 "Tahoe-LAFS" 3 "OpenStack SWIFT" 11 "Google Drive" 7 "Amazon Glacier"]]
This poll is ordered with the options I consider easiest to build
listed first. Mostly because git-annex already supports them and they