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

4 files changed, 62 insertions, 0 deletions

diff --git a/doc/bugs/git_pack-objects_eats_all_teh_ram/comment_1_24df756bb2aac06c227fdc55d944e1d3._comment b/doc/bugs/git_pack-objects_eats_all_teh_ram/comment_1_24df756bb2aac06c227fdc55d944e1d3._comment
new file mode 100644
index 0000000000..e1a4adac76
--- /dev/null
+++ b/doc/bugs/git_pack-objects_eats_all_teh_ram/comment_1_24df756bb2aac06c227fdc55d944e1d3._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c"
+ nickname="Justin"
+ subject="comment 1"
+ date="2015-03-24T15:30:30Z"
+ content="""
+One thing that's odd is that, if I disable swap, it still eats all my ram, and kswapd0 is still the primary user of CPU.  The machine is even slower than it was before; iotop takes more than a minute to low.  My best explanation is it must be swapping by kicking out cached pages.
+"""]]
diff --git a/doc/forum/copy_and_move__63__.mdwn b/doc/forum/copy_and_move__63__.mdwn
new file mode 100644
index 0000000000..88ce775034
--- /dev/null
+++ b/doc/forum/copy_and_move__63__.mdwn
@@ -0,0 +1,19 @@
+My use case is that I [import media](http://ix.io/h6m) from my iphone/gopro to my laptop. I then want to upload them to [Flickr](https://www.flickr.com/) (JPG/PNG) and S3 (MP4). However I want to keep a backup using git-annex onto a external USB drive.
+
+# How do I quickly copy and drop?
+
+I realise I can:
+
+1. git-annex add 2014-*
+* git-annex copy --to 2tbusbdrive
+* git-annex drop 2014-*
+
+But that's several steps. Is there a quicker way?
+
+# How do drop only files I've actually uploaded?
+
+In the past, I've just marked files as uploaded by `touch "$media.uploaded"` once my python Flickr script returns a successful error code. But I have no idea how to tell git-annex that this means the file can now be dropped, providing a copy exists on my **2tbusbdrive**.
+
+# Furthermore keeping a clean deck
+
+Tbh I don't want the old upload files/directories cluttering up my _uploadme_ directory. Can I just delete them or configure drop to remove the filename too?
diff --git a/doc/submodules/comment_1_0f85dc34b69725bbdcee23eb3eadab89._comment b/doc/submodules/comment_1_0f85dc34b69725bbdcee23eb3eadab89._comment
new file mode 100644
index 0000000000..7c8d184eac
--- /dev/null
+++ b/doc/submodules/comment_1_0f85dc34b69725bbdcee23eb3eadab89._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY"
+ nickname="Yaroslav"
+ subject="Unfortunately still seems to puke while operating on evil Windows -- git annex init fails"
+ date="2015-03-24T19:29:03Z"
+ content="""
+http://www.onerussian.com/tmp/gkrellShoot_03-24-15_152321.png
+
+"""]]
diff --git a/doc/todo/What_if_the_active_annex__39__ed_files_were_not_symlinks__63__.mdwn b/doc/todo/What_if_the_active_annex__39__ed_files_were_not_symlinks__63__.mdwn
new file mode 100644
index 0000000000..3209769257
--- /dev/null
+++ b/doc/todo/What_if_the_active_annex__39__ed_files_were_not_symlinks__63__.mdwn
@@ -0,0 +1,26 @@
+So annex is super cool and all. But there is one really annoying thing about it. The symlinks disrupt workflow really horribly! For example if I have a .psd file that is annex'd and I open that file in photoshop, edit it, then try to save it again. It doesn't allow me, because the actual file is the one deep in the annex sub structure that is read only. There a bunch of other annoyances like this. But you basically can't work with annex'd files without some additional struggle.
+
+But there is a solution to this. Just don't symlink the files that are active. I think potentially the simplest way to do this is to have a 'annex' and 'unannex' command. Or rather, a 'create symlink' and 'uncreate symlink' command. 
+
+So then you can be going along, doing your work, nothing in your directory symlinked.
+
+You then type you 'annex symlink' command all priorly annexed filed will be deleted and replaced with their symlinks.
+
+Then you can add your new files to annex. Adding new files will just automatically symlink them unless you put like a -ns or something to signify to not symlink them.
+
+With all priorly annexed filed symlinked and all your new files symlinked, you then git commit and push.
+
+Then you do a git annex unsymlink command. And then all your symlinks are deleted and the actual file placed there.
+
+Then you just type git annex symlink again to re-symlink them all.
+
+> I think you are looking for the `unlock` and `add` (or `lock`) commands. Basically, to edit the file in photoshop, you want:
+>
+> <pre>
+> git annex unlock file.psd
+> photoshop file.psd # ...
+> git annex add file.psd # if you are happy with your changes or...
+> git annex lock file.psd # if you want to discard your changes
+> </pre>
+>
+> So basically what you are asking for is already [[done]], in my mind. I still think there are significant [[usability issues|forum/usability:_what_are_those_arrow_things__63__/]] with symlinks, but that's another story. --[[anarcat]]