From dda2e51f3601f9f8552ce633014c0c5b9fbd0fde Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 9 Jan 2015 23:45:11 +0000 Subject: [PATCH 01/14] --- doc/forum/Sync_files_from_remote_to_remote.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/forum/Sync_files_from_remote_to_remote.mdwn diff --git a/doc/forum/Sync_files_from_remote_to_remote.mdwn b/doc/forum/Sync_files_from_remote_to_remote.mdwn new file mode 100644 index 0000000000..a60e980458 --- /dev/null +++ b/doc/forum/Sync_files_from_remote_to_remote.mdwn @@ -0,0 +1,5 @@ +Not sure if this use case is supported, but I have the following setup - I use git-annex to store my Lightroom catalog and photos. My local machine does not contain all files, `.mov` files for example are excluded via the preferred content mechanism. The full backup is on a remote server using ssh. + +Now I want to create another copy of the data (encrypted) from my local machine to a USB stick or similar. I found that the locally excluded files are not synced. In order to copy all the data I first need to change the preferred content config, execute `git-annex get` to fetch the data, then copy via `git annex sync myusbremote --content`, then change the local preferred content pattern, then run `git annex drop --auto` to delete the local unwanted content again. + +I was wondering if there's a way to sync from one remote to another, without storing any data locallly ? Something like `git sync --from ... --to ...`. From e27ef9483aea7a12ddff5e827795f23fbe013a43 Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 9 Jan 2015 23:48:46 +0000 Subject: [PATCH 02/14] typo --- doc/forum/Sync_files_from_remote_to_remote.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/forum/Sync_files_from_remote_to_remote.mdwn b/doc/forum/Sync_files_from_remote_to_remote.mdwn index a60e980458..597edbf5f4 100644 --- a/doc/forum/Sync_files_from_remote_to_remote.mdwn +++ b/doc/forum/Sync_files_from_remote_to_remote.mdwn @@ -2,4 +2,4 @@ Not sure if this use case is supported, but I have the following setup - I use g Now I want to create another copy of the data (encrypted) from my local machine to a USB stick or similar. I found that the locally excluded files are not synced. In order to copy all the data I first need to change the preferred content config, execute `git-annex get` to fetch the data, then copy via `git annex sync myusbremote --content`, then change the local preferred content pattern, then run `git annex drop --auto` to delete the local unwanted content again. -I was wondering if there's a way to sync from one remote to another, without storing any data locallly ? Something like `git sync --from ... --to ...`. +I was wondering if there's a way to sync from one remote to another, without storing any data locallly ? Something like `git-annex sync --from ... --to ...`. From bb9d55442ccfe7ceaa1f1c4fb2e4fa13aaa4cbc5 Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 9 Jan 2015 23:49:31 +0000 Subject: [PATCH 03/14] --- doc/forum/Sync_files_from_remote_to_remote.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/forum/Sync_files_from_remote_to_remote.mdwn b/doc/forum/Sync_files_from_remote_to_remote.mdwn index 597edbf5f4..a723c33f33 100644 --- a/doc/forum/Sync_files_from_remote_to_remote.mdwn +++ b/doc/forum/Sync_files_from_remote_to_remote.mdwn @@ -1,5 +1,5 @@ Not sure if this use case is supported, but I have the following setup - I use git-annex to store my Lightroom catalog and photos. My local machine does not contain all files, `.mov` files for example are excluded via the preferred content mechanism. The full backup is on a remote server using ssh. -Now I want to create another copy of the data (encrypted) from my local machine to a USB stick or similar. I found that the locally excluded files are not synced. In order to copy all the data I first need to change the preferred content config, execute `git-annex get` to fetch the data, then copy via `git annex sync myusbremote --content`, then change the local preferred content pattern, then run `git annex drop --auto` to delete the local unwanted content again. +Now I want to create another copy of the data (encrypted) from my local machine to a USB stick or similar. I found that the locally excluded files are not synced. In order to copy all the data I first need to change the preferred content config, execute `git-annex get` to fetch the data, then copy via `git-annex sync myusbremote --content`, then change the local preferred content pattern, then run `git annex drop --auto` to delete the local unwanted content again. I was wondering if there's a way to sync from one remote to another, without storing any data locallly ? Something like `git-annex sync --from ... --to ...`. From dda6264669bb518b077fffc5b423b2d4219d4646 Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 10 Jan 2015 10:37:12 +0000 Subject: [PATCH 04/14] Added a comment --- ..._4dc4f1ea91c72418843a682fab1854d2._comment | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 doc/forum/using_git-annex_with_lightroom/comment_2_4dc4f1ea91c72418843a682fab1854d2._comment diff --git a/doc/forum/using_git-annex_with_lightroom/comment_2_4dc4f1ea91c72418843a682fab1854d2._comment b/doc/forum/using_git-annex_with_lightroom/comment_2_4dc4f1ea91c72418843a682fab1854d2._comment new file mode 100644 index 0000000000..d0626d4c72 --- /dev/null +++ b/doc/forum/using_git-annex_with_lightroom/comment_2_4dc4f1ea91c72418843a682fab1854d2._comment @@ -0,0 +1,28 @@ +[[!comment format=mdwn + username="Jan" + subject="comment 2" + date="2015-01-10T10:37:11Z" + content=""" +I had the same problem an got Lightroom to work nicely with the following configuration. + +Place catalog and photo data in the same directory tree, for example: + + + /Lightroom/2015/2015-01-10/IMG_4432.JPG + /Lightroom/2015/2015-01-10/IMG_4433.JPG + ... + /Lightroom/Catalog/Lightroom 5 Catalog.lrcat + /Lightroom/Catalog/Lightroom 5 Catalog Previews.lrdata + /Lightroom/Catalog/Backups + + +Now the image data and Lightroom metadata (= catalog) can be archived at the same time. In order to prevent temporary files and previews to get annexed use the following `.gitignore`: + + + */*.lrdata + Temporary Folder*/ + */Temporary Import Data*/ + *.lock + +The downside is that previews will have to get regenerated on other machines which pull this data, but I don't use it to share my Lightroom config across computers but as an archival tool. +"""]] From 035f624d4de0487e7238f0e497fbfb33b35bcb33 Mon Sep 17 00:00:00 2001 From: "http://www.ryantm.com/" Date: Sat, 10 Jan 2015 16:48:06 +0000 Subject: [PATCH 05/14] --- doc/install/NixOS.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/install/NixOS.mdwn b/doc/install/NixOS.mdwn index 115f9fa532..e9730b2856 100644 --- a/doc/install/NixOS.mdwn +++ b/doc/install/NixOS.mdwn @@ -2,5 +2,9 @@ Users of the [Nix package manager](http://nixos.org/) can install it by running: nix-env -i git-annex +When including it in a NixOS configuration.nix file, the name of the reference to the package is + + haskellPackages.gitAnnex + The build status of the package within Nix can be seen on the [Hydra Build Farm](http://hydra.nixos.org/job/nixpkgs/trunk/gitAndTools.gitAnnex). From ed74130cd79885daa2b0849618343222e14a4174 Mon Sep 17 00:00:00 2001 From: "https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574" Date: Sun, 11 Jan 2015 04:00:04 +0000 Subject: [PATCH 06/14] Added a comment: assistant or cron --- .../comment_1_c5247657a5b3cd68fd55112efe97ef99._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Sync_files_from_remote_to_remote/comment_1_c5247657a5b3cd68fd55112efe97ef99._comment diff --git a/doc/forum/Sync_files_from_remote_to_remote/comment_1_c5247657a5b3cd68fd55112efe97ef99._comment b/doc/forum/Sync_files_from_remote_to_remote/comment_1_c5247657a5b3cd68fd55112efe97ef99._comment new file mode 100644 index 0000000000..66ee6ce6ae --- /dev/null +++ b/doc/forum/Sync_files_from_remote_to_remote/comment_1_c5247657a5b3cd68fd55112efe97ef99._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574" + nickname="Mica Semrick" + subject="assistant or cron" + date="2015-01-11T04:00:04Z" + content=""" +I'd either (1) run the assistant on your server or (2) write a simple cron script that runs git-annex sync --content on the server. +"""]] From 5532ba4d9c3ee48aa8683691a43c88006f38b6ff Mon Sep 17 00:00:00 2001 From: Jan Date: Sun, 11 Jan 2015 08:54:52 +0000 Subject: [PATCH 07/14] Added a comment --- .../comment_2_634e399d21271f26f7f77c15c5fb132b._comment | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/forum/Sync_files_from_remote_to_remote/comment_2_634e399d21271f26f7f77c15c5fb132b._comment diff --git a/doc/forum/Sync_files_from_remote_to_remote/comment_2_634e399d21271f26f7f77c15c5fb132b._comment b/doc/forum/Sync_files_from_remote_to_remote/comment_2_634e399d21271f26f7f77c15c5fb132b._comment new file mode 100644 index 0000000000..4a0038f9d4 --- /dev/null +++ b/doc/forum/Sync_files_from_remote_to_remote/comment_2_634e399d21271f26f7f77c15c5fb132b._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="Jan" + subject="comment 2" + date="2015-01-11T08:54:52Z" + content=""" +this would work, but the server is on a remote machine and the USB drive I want to sync to is connected to my local machine. +"""]] From 9fe75ef124089d0f17a6f4ea71ecc3658274f3a7 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnm19dBCRphmtjXfopm_NpvnRwz-qIJ2Tw" Date: Sun, 11 Jan 2015 09:14:47 +0000 Subject: [PATCH 08/14] Added a comment: May be use a prefered content expression about what is in the usb stick --- ...comment_3_b89701582b40e2c337a1a49733877210._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Sync_files_from_remote_to_remote/comment_3_b89701582b40e2c337a1a49733877210._comment diff --git a/doc/forum/Sync_files_from_remote_to_remote/comment_3_b89701582b40e2c337a1a49733877210._comment b/doc/forum/Sync_files_from_remote_to_remote/comment_3_b89701582b40e2c337a1a49733877210._comment new file mode 100644 index 0000000000..73c9cc0bcd --- /dev/null +++ b/doc/forum/Sync_files_from_remote_to_remote/comment_3_b89701582b40e2c337a1a49733877210._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnm19dBCRphmtjXfopm_NpvnRwz-qIJ2Tw" + nickname="Remi" + subject="May be use a prefered content expression about what is in the usb stick" + date="2015-01-11T09:14:47Z" + content=""" +Is there a full git repos on the usb stick? if yes You could add a remote on it and run `git annex --content` from there. + +You could also try to change the preferred content of your local machine to include something like \"--not --in=usb\". With this you local repos will download file not in the usb stick, copy it to the usb stick and then remove it from the local repos. (I didn't check exactly the syntax of the preferred content, so my expression could be incorrect, but I hope you get the idea) +"""]] From 08dde5764ad19230cea4f0b07f9c0bd6b52e0922 Mon Sep 17 00:00:00 2001 From: ztzg Date: Mon, 12 Jan 2015 17:53:07 +0000 Subject: [PATCH 09/14] Added a comment: Build 5.20150107-g0e8cf92 seems to work --- ...14_fd30c9f9c3713728fb910b310397ba32._comment | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_14_fd30c9f9c3713728fb910b310397ba32._comment diff --git a/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_14_fd30c9f9c3713728fb910b310397ba32._comment b/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_14_fd30c9f9c3713728fb910b310397ba32._comment new file mode 100644 index 0000000000..de92a09ee5 --- /dev/null +++ b/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_14_fd30c9f9c3713728fb910b310397ba32._comment @@ -0,0 +1,17 @@ +[[!comment format=mdwn + username="ztzg" + subject="Build 5.20150107-g0e8cf92 seems to work" + date="2015-01-12T17:53:07Z" + content=""" +Hi Joey, everybody, + +I was successful in syncing a repository (twice, and including contents) using version 5.20150107-g0e8cf92. +The environment is: Nexus 7 (2013), Android 5.0.1, not rooted. + +Note, however, that this version spews a lot of bionic warnings (I'm using +git-annex from the terminal): + +![Warnings](http://dd.crosstwine.com/tmp/git-annex-bionic-warnings.png) + +Probably hamless, but I thought I'd mention them. +"""]] From 464cd84f683d607c550cd8ec00015993b94c16e6 Mon Sep 17 00:00:00 2001 From: ztzg Date: Mon, 12 Jan 2015 17:56:20 +0000 Subject: [PATCH 10/14] Added a comment --- .../comment_15_82446751b835e95832d4aefd7805cd1f._comment | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_15_82446751b835e95832d4aefd7805cd1f._comment diff --git a/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_15_82446751b835e95832d4aefd7805cd1f._comment b/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_15_82446751b835e95832d4aefd7805cd1f._comment new file mode 100644 index 0000000000..c86607ef8b --- /dev/null +++ b/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_15_82446751b835e95832d4aefd7805cd1f._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="ztzg" + subject="comment 15" + date="2015-01-12T17:56:20Z" + content=""" +Oh, and many thanks! +"""]] From 288d7933a40b96e19b4a51dc830e52ff1429068b Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 13 Jan 2015 09:35:10 +0000 Subject: [PATCH 11/14] Added a comment --- .../comment_4_b3ad93e032c3c9d2312970711540bf92._comment | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/forum/Sync_files_from_remote_to_remote/comment_4_b3ad93e032c3c9d2312970711540bf92._comment diff --git a/doc/forum/Sync_files_from_remote_to_remote/comment_4_b3ad93e032c3c9d2312970711540bf92._comment b/doc/forum/Sync_files_from_remote_to_remote/comment_4_b3ad93e032c3c9d2312970711540bf92._comment new file mode 100644 index 0000000000..ad730a3ead --- /dev/null +++ b/doc/forum/Sync_files_from_remote_to_remote/comment_4_b3ad93e032c3c9d2312970711540bf92._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="Jan" + subject="comment 4" + date="2015-01-13T09:35:10Z" + content=""" +Thanks for your answers. But I want to encrypt the content, so initialising a repo on the stick is not a possibility if I understand it correctly. And wouldn't `--not --in=usb` exclude a lot of content I actually want ? (Haven't tried it yet) +"""]] From d31dd80e2ff248fcd8a210a55c32090db3b049fa Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 13 Jan 2015 09:48:31 +0000 Subject: [PATCH 12/14] --- doc/forum/OSX_Finder_extension.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/forum/OSX_Finder_extension.mdwn diff --git a/doc/forum/OSX_Finder_extension.mdwn b/doc/forum/OSX_Finder_extension.mdwn new file mode 100644 index 0000000000..2b0e6c374f --- /dev/null +++ b/doc/forum/OSX_Finder_extension.mdwn @@ -0,0 +1,5 @@ +OSX 10.10 / Yosemite introduces the [Finder Sync extension][] which allows any app / extension to display informational badges in Finder. This could be used to indicate the sync status (there are some stories which claim the extensions got added because Dropbox used an undocumented API previously). I had a quick look and it would not be too difficult to implement a simple extension which reads the metadata from the `.git/annex` directory and shows a sync / transfer status icon. + +Just wanted to throw the idea out there, I might even start building it. + +[Finder Sync Extension]: https://developer.apple.com/library/prerelease/ios/documentation/General/Conceptual/ExtensibilityPG/Finder.html From 28f9f3eb90b9e24b9782894e4f8354fefc3bb78b Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnm19dBCRphmtjXfopm_NpvnRwz-qIJ2Tw" Date: Tue, 13 Jan 2015 12:45:47 +0000 Subject: [PATCH 13/14] Added a comment --- ..._bdf293d30692311983d0586231535bd4._comment | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/forum/Sync_files_from_remote_to_remote/comment_5_bdf293d30692311983d0586231535bd4._comment diff --git a/doc/forum/Sync_files_from_remote_to_remote/comment_5_bdf293d30692311983d0586231535bd4._comment b/doc/forum/Sync_files_from_remote_to_remote/comment_5_bdf293d30692311983d0586231535bd4._comment new file mode 100644 index 0000000000..4ea668070c --- /dev/null +++ b/doc/forum/Sync_files_from_remote_to_remote/comment_5_bdf293d30692311983d0586231535bd4._comment @@ -0,0 +1,20 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnm19dBCRphmtjXfopm_NpvnRwz-qIJ2Tw" + nickname="Remi" + subject="comment 5" + date="2015-01-13T12:45:47Z" + content=""" +Well my idea wasn't to have only this in the preferred content. You +can use \"or\" expression. + +That said, I've just check the manual, and it seem that there is no --in for +preferred content... But you could add your usb repos say to the +archival group (git annex group usb archival), Then use something like +like `\"include=* and ( exclude=*.mov or not inallgroup=archival )\"` +(this is untested, but I hope you get the idea). + +With such a preferred content, you local repository should get (and +keep) the .mov not in usb, and should drop them when they are send +there. + +"""]] From cf247cf6cc8468c88e702223652bcca92cc90160 Mon Sep 17 00:00:00 2001 From: eeerky Date: Tue, 13 Jan 2015 15:24:25 +0000 Subject: [PATCH 14/14] Added a comment: shared keys? --- ...omment_4_d8e4b08ceedece8a45d4146ff5d3a995._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/tips/Synology_NAS_and_git_annex/comment_4_d8e4b08ceedece8a45d4146ff5d3a995._comment diff --git a/doc/tips/Synology_NAS_and_git_annex/comment_4_d8e4b08ceedece8a45d4146ff5d3a995._comment b/doc/tips/Synology_NAS_and_git_annex/comment_4_d8e4b08ceedece8a45d4146ff5d3a995._comment new file mode 100644 index 0000000000..2c68f7e2eb --- /dev/null +++ b/doc/tips/Synology_NAS_and_git_annex/comment_4_d8e4b08ceedece8a45d4146ff5d3a995._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="eeerky" + subject="shared keys?" + date="2015-01-13T15:24:25Z" + content=""" +I'm not sure if I'm misreading this walkthrough, but does prefixing your key in authorize_keys file mean that the specific key pair can only be used in conjunction with git annex? + +In other words, if I wish to have one key pair between my laptop and server, could I use that one key pair for both git-annex and simple shell access? + +What I'm seeing now is that the path to my **git-annex-shell** script is correct, but my server goes into high cpu and doesn't let me login when I try sshing into it. +"""]]