From b24b76006eeb2fa076b6a190d9db90c0f2975683 Mon Sep 17 00:00:00 2001 From: GLITTAH Date: Tue, 19 Nov 2013 02:56:32 +0000 Subject: [PATCH 1/9] --- ...tly_requires_twice_the_size_of_repo_to_complete__41__.mdwn | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/todo/wishlist:_incremental_unannex___40__currently_requires_twice_the_size_of_repo_to_complete__41__.mdwn diff --git a/doc/todo/wishlist:_incremental_unannex___40__currently_requires_twice_the_size_of_repo_to_complete__41__.mdwn b/doc/todo/wishlist:_incremental_unannex___40__currently_requires_twice_the_size_of_repo_to_complete__41__.mdwn new file mode 100644 index 0000000000..58aa9bae27 --- /dev/null +++ b/doc/todo/wishlist:_incremental_unannex___40__currently_requires_twice_the_size_of_repo_to_complete__41__.mdwn @@ -0,0 +1,4 @@ +I recently tried to use unannex for a large repo and it failed because the repo size was more than half the disk size. Unannex should work incrementally so this isn't a problem. + +Proposed solution: +copy a file, hash it, iff hash check is okay, delete from objects, continue to next file From 3bbca09cc7f9664b76ee95b2c14094990b9b449b Mon Sep 17 00:00:00 2001 From: "https://domtheo.myopenid.com/" Date: Tue, 19 Nov 2013 04:47:21 +0000 Subject: [PATCH 2/9] --- doc/walkthrough.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/walkthrough.mdwn b/doc/walkthrough.mdwn index f401524f51..0e661a9519 100644 --- a/doc/walkthrough.mdwn +++ b/doc/walkthrough.mdwn @@ -23,3 +23,4 @@ A walkthrough of the basic features of git-annex. walkthrough/automatically_managing_content walkthrough/more """]] +[Aksesoris mobil](http://kiosauto.com), [Sewa mobil jakarta](http://www.awanirentcar.com), [Sewa mobil jakarta selatan](http://www.awanirentcar.com/about-us), [Toko bunga online bandung](http://www.tokobungasabana.com) From d8db596d590a6905331a132bf32145422569d7e4 Mon Sep 17 00:00:00 2001 From: "https://domtheo.myopenid.com/" Date: Tue, 19 Nov 2013 04:50:03 +0000 Subject: [PATCH 3/9] --- doc/tips/centralized_git_repository_tutorial.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/tips/centralized_git_repository_tutorial.mdwn b/doc/tips/centralized_git_repository_tutorial.mdwn index 00283829fd..5fef2b7e04 100644 --- a/doc/tips/centralized_git_repository_tutorial.mdwn +++ b/doc/tips/centralized_git_repository_tutorial.mdwn @@ -25,12 +25,14 @@ This means you can't store annexed file *contents* on GitHub; it would really be better to host the bare repository on your own server, which would not have this limitation. (If you want to do that, check out [[using_gitolite_with_git-annex]].) +[Sewa mobil jakarta](http://www.awanirentcar.com), [Sewa mobil jakarta pusat](http://www.awanirentcar.com/pricelist), [Aksesoris mobil](http://kiosauto.com) # git config remote.origin.annex-ignore true ## add files to the repository Add some files, obtained however. +[Gps tracker motor](http://vamostech.com/gps-tracking), [Gps tracking motor](http://vamostech.com/gps-tracking) # youtube-dl -t 'http://www.youtube.com/watch?v=b9FagOVqxmI' # git annex add *.mp4 From f8525d27171012ef21165e001bfa00c11d35f088 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ" Date: Tue, 19 Nov 2013 07:58:05 +0000 Subject: [PATCH 4/9] revert linkspam This reverts commit 3bbca09cc7f9664b76ee95b2c14094990b9b449b --- doc/walkthrough.mdwn | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/walkthrough.mdwn b/doc/walkthrough.mdwn index 0e661a9519..f401524f51 100644 --- a/doc/walkthrough.mdwn +++ b/doc/walkthrough.mdwn @@ -23,4 +23,3 @@ A walkthrough of the basic features of git-annex. walkthrough/automatically_managing_content walkthrough/more """]] -[Aksesoris mobil](http://kiosauto.com), [Sewa mobil jakarta](http://www.awanirentcar.com), [Sewa mobil jakarta selatan](http://www.awanirentcar.com/about-us), [Toko bunga online bandung](http://www.tokobungasabana.com) From 5225978fdabbed46b13d924ef3e86251a0623750 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ" Date: Tue, 19 Nov 2013 07:58:14 +0000 Subject: [PATCH 5/9] revert linkspam This reverts commit d8db596d590a6905331a132bf32145422569d7e4 --- doc/tips/centralized_git_repository_tutorial.mdwn | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/tips/centralized_git_repository_tutorial.mdwn b/doc/tips/centralized_git_repository_tutorial.mdwn index 5fef2b7e04..00283829fd 100644 --- a/doc/tips/centralized_git_repository_tutorial.mdwn +++ b/doc/tips/centralized_git_repository_tutorial.mdwn @@ -25,14 +25,12 @@ This means you can't store annexed file *contents* on GitHub; it would really be better to host the bare repository on your own server, which would not have this limitation. (If you want to do that, check out [[using_gitolite_with_git-annex]].) -[Sewa mobil jakarta](http://www.awanirentcar.com), [Sewa mobil jakarta pusat](http://www.awanirentcar.com/pricelist), [Aksesoris mobil](http://kiosauto.com) # git config remote.origin.annex-ignore true ## add files to the repository Add some files, obtained however. -[Gps tracker motor](http://vamostech.com/gps-tracking), [Gps tracking motor](http://vamostech.com/gps-tracking) # youtube-dl -t 'http://www.youtube.com/watch?v=b9FagOVqxmI' # git annex add *.mp4 From b12105d9f5de4d19a32dd02e13430ab1f0c4db5f Mon Sep 17 00:00:00 2001 From: David Date: Tue, 19 Nov 2013 09:17:27 +0000 Subject: [PATCH 6/9] Added a comment --- .../comment_13_571cffc0beb8ba5fc936db6971cd3d62._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_13_571cffc0beb8ba5fc936db6971cd3d62._comment diff --git a/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_13_571cffc0beb8ba5fc936db6971cd3d62._comment b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_13_571cffc0beb8ba5fc936db6971cd3d62._comment new file mode 100644 index 0000000000..aefe988132 --- /dev/null +++ b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_13_571cffc0beb8ba5fc936db6971cd3d62._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="David" + ip="178.21.48.117" + subject="comment 13" + date="2013-11-19T09:17:26Z" + content=""" +Please tell me if/how I can help you. For example if you need access to servers to test... +"""]] From 5154ca2585c551604c4365c9fe005e3cfd8f9af0 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 19 Nov 2013 09:28:32 +0000 Subject: [PATCH 7/9] --- ...me_cases__44___although_used_remotely.mdwn | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 doc/bugs/Assistant_redirects_to_127.0.0.1_in_some_cases__44___although_used_remotely.mdwn diff --git a/doc/bugs/Assistant_redirects_to_127.0.0.1_in_some_cases__44___although_used_remotely.mdwn b/doc/bugs/Assistant_redirects_to_127.0.0.1_in_some_cases__44___although_used_remotely.mdwn new file mode 100644 index 0000000000..7480249b62 --- /dev/null +++ b/doc/bugs/Assistant_redirects_to_127.0.0.1_in_some_cases__44___although_used_remotely.mdwn @@ -0,0 +1,26 @@ +### Please describe the problem. +When I use git-annex webapp with a remote IP of a headless computer, +I am sometimes redirected to a 127.0.0.1 address (with a different +port as well) + +### What steps will reproduce the problem? +1. Install git-annex as usual. +2. Open git-annex assistant from a headless machine and access the +webapp with the --listen option. (e.g. git annex webapp +--listen=xxx.yyy.zzz.www) +3. Create your first local repository. Then create a second local +repository. +4. When assistant asks you if you want to merge these 2 +repositories, try to select the second option (to keep them +separated). +5. You are redirected from your remote IP to 127.0.0.1 to a new port number. + +(I also encountered the same error at another menu or function, but +I don't remember where. Sorry.) + +### What version of git-annex are you using? On what operating system? +4.20130815 +Ubuntu 13.10 64-bit (kernel 3.11.0-13-generic x86_64) + +### Please provide any additional information below. +Please ask me for any additional information that may be useful. From a6e2b289c204bbf84f73cea49d5e98b439242ed3 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U" Date: Tue, 19 Nov 2013 09:48:27 +0000 Subject: [PATCH 8/9] Added a comment --- ...nt_6_5a348c5f327f16e1192ef6bd7f2880bb._comment | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_5a348c5f327f16e1192ef6bd7f2880bb._comment diff --git a/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_5a348c5f327f16e1192ef6bd7f2880bb._comment b/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_5a348c5f327f16e1192ef6bd7f2880bb._comment new file mode 100644 index 0000000000..7e611cebd4 --- /dev/null +++ b/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_5a348c5f327f16e1192ef6bd7f2880bb._comment @@ -0,0 +1,15 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U" + nickname="Carlo" + subject="comment 6" + date="2013-11-19T09:48:26Z" + content=""" +Sorry, missed the comment. + +My work repo is the repository on my work laptop, where deletions got synced to. + +Git annex had then run repository repair automatically, so the odd symlinks where no longer there for me to check out. + +It is possible that I ran some git commands in direct mode I shouldn't have; I put the files back in and it's working nicely now. So this might have been a \"no direct mode guard\" issue. + +"""]] From 379cdca99380c48dfa3ea0fa285dfd1ec99c1d7b Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawme63-Q4pahQsIS1nNvXgAc3N5kq8y0GMQ" Date: Tue, 19 Nov 2013 12:20:07 +0000 Subject: [PATCH 9/9] --- doc/sync.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sync.mdwn b/doc/sync.mdwn index ade34d48da..37b2b1b459 100644 --- a/doc/sync.mdwn +++ b/doc/sync.mdwn @@ -7,7 +7,7 @@ That works fine, if you don't mind having a central repository. But it can be harder to use git in a fully decentralized fashion, with no central repository and still keep repositories in sync with one another. -You have to remember to pull from each remote, and merge the appopriate +You have to remember to pull from each remote, and merge the appropriate branch after pulling. It's difficult to *push* to a remote, since git does not allow pushes into the currently checked out branch.