From f99fb300c2905d041e5376c18ecaa013d981bb87 Mon Sep 17 00:00:00 2001 From: "aloukian@c071735c08bc04266b792aa478ad1bae2d6a8b50" <aloukian@web> Date: Fri, 11 Sep 2015 00:42:03 +0000 Subject: [PATCH 1/6] Added a comment --- ..._6945d9e930e7385f0abe6538622a9aa3._comment | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 doc/forum/Add_file_to_git_index_while_in_direct_mode/comment_2_6945d9e930e7385f0abe6538622a9aa3._comment diff --git a/doc/forum/Add_file_to_git_index_while_in_direct_mode/comment_2_6945d9e930e7385f0abe6538622a9aa3._comment b/doc/forum/Add_file_to_git_index_while_in_direct_mode/comment_2_6945d9e930e7385f0abe6538622a9aa3._comment new file mode 100644 index 0000000000..7dc65c2dc6 --- /dev/null +++ b/doc/forum/Add_file_to_git_index_while_in_direct_mode/comment_2_6945d9e930e7385f0abe6538622a9aa3._comment @@ -0,0 +1,31 @@ +[[!comment format=mdwn + username="aloukian@c071735c08bc04266b792aa478ad1bae2d6a8b50" + nickname="aloukian" + subject="comment 2" + date="2015-09-11T00:42:03Z" + content=""" +Sorry, I should have clarified. I was not sure how to add a commit message. + +I played with a test repo and I think I figured it out. What I tried was this: + +``` +$ git init test-repo +$ touch test.txt +$ git add test.txt +$ git commit -m \"initial commit\" +$ git annex init +$ git config annex.largefiles=\"*.pdf\" +$ echo \"updated\" > test.txt +$ git annex add test.txt +$ git annex sync -m \"updated test.txt\" +``` + +So if I understand correctly, in direct mode + +- ```git add``` -> ```git annex add``` +- ```git commit -m MSG``` -> ```git annex sync -m MSG``` + +```git log``` now shows the right message, but I am still not sure how to check whether a file is in the annex or directly in the git tree. I suppose I could just make aliases for git add and git commit, but I wouldn't be able to add arbitrary files to git annex without playing with annex.largefiles. For example, if I had many small ```.txt``` files and one large file and I wanted to just add that large file to the git annex, I'd have to change the largefiles setting. + +Is there a better way of doing this or is loss of functionality intrinsic until Windows symlinks work? +"""]] From 793f201e8e4540b261bfc48de9acf98b18f0556f Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8" <Hamza@web> Date: Fri, 11 Sep 2015 10:17:03 +0000 Subject: [PATCH 2/6] --- ...not_respect_preferred_content_settings.mdwn | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 doc/forum/git-annex_does_not_respect_preferred_content_settings.mdwn diff --git a/doc/forum/git-annex_does_not_respect_preferred_content_settings.mdwn b/doc/forum/git-annex_does_not_respect_preferred_content_settings.mdwn new file mode 100644 index 0000000000..9849f396de --- /dev/null +++ b/doc/forum/git-annex_does_not_respect_preferred_content_settings.mdwn @@ -0,0 +1,18 @@ +I have the following vicfg, + +group UUID1 = PodA +group UUID2 = PodA +group UUID3 = PodA +group UUID4 = PodB + +wanted UUID1 = groupwanted +wanted UUID2 = groupwanted +wanted UUID3 = groupwanted +wanted UUID4 = groupwanted + +groupwanted PodA = present and not copies=PodA:1 +groupwanted PodB = present and not copies=PodB:1 + +at this point repos 1 2 3 combined has 1 copy of each file and repo 4 has full copy of all files. (used to move files around manually before grouping repos). + +What I am trying to achieve is to have a copy of a file in one of the 3 repos (1 2 3) and one copy in 4. running git annex get --auto starts getting all files, files with copies on other disks. testing using git annex find --want-get --not --in . returns all remaining files not in the repo but has enough copies on other repos both PodA and PodB has copies. numofcopies is set to 2. From 19ed545b960f42770c796d05406154b4d219834f Mon Sep 17 00:00:00 2001 From: OlivierBerger <OlivierBerger@web> Date: Fri, 11 Sep 2015 11:43:43 +0000 Subject: [PATCH 3/6] Added a comment: Seems t owork now with git 2.5 for windows and daily build on windows 7 --- .../comment_6_709f8688e48c6d3d68730ed47e94a1e9._comment | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_6_709f8688e48c6d3d68730ed47e94a1e9._comment diff --git a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_6_709f8688e48c6d3d68730ed47e94a1e9._comment b/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_6_709f8688e48c6d3d68730ed47e94a1e9._comment new file mode 100644 index 0000000000..41668a0870 --- /dev/null +++ b/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_6_709f8688e48c6d3d68730ed47e94a1e9._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="OlivierBerger" + subject="Seems t owork now with git 2.5 for windows and daily build on windows 7" + date="2015-09-11T11:43:43Z" + content=""" +I have tested again, and this time it seems to work out of the box. Thanks alot @joeyh +"""]] From 35af7635d56d570b21c89d4b89fb6a700b725752 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8" <Hamza@web> Date: Fri, 11 Sep 2015 11:54:36 +0000 Subject: [PATCH 4/6] --- ...ot_respect_preferred_content_settings.mdwn | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/forum/git-annex_does_not_respect_preferred_content_settings.mdwn b/doc/forum/git-annex_does_not_respect_preferred_content_settings.mdwn index 9849f396de..bb719e08d4 100644 --- a/doc/forum/git-annex_does_not_respect_preferred_content_settings.mdwn +++ b/doc/forum/git-annex_does_not_respect_preferred_content_settings.mdwn @@ -1,17 +1,17 @@ I have the following vicfg, -group UUID1 = PodA -group UUID2 = PodA -group UUID3 = PodA -group UUID4 = PodB + group UUID1 = PodA + group UUID2 = PodA + group UUID3 = PodA + group UUID4 = PodB -wanted UUID1 = groupwanted -wanted UUID2 = groupwanted -wanted UUID3 = groupwanted -wanted UUID4 = groupwanted + wanted UUID1 = groupwanted + wanted UUID2 = groupwanted + wanted UUID3 = groupwanted + wanted UUID4 = groupwanted -groupwanted PodA = present and not copies=PodA:1 -groupwanted PodB = present and not copies=PodB:1 + groupwanted PodA = present and not copies=PodA:1 + groupwanted PodB = present and not copies=PodB:1 at this point repos 1 2 3 combined has 1 copy of each file and repo 4 has full copy of all files. (used to move files around manually before grouping repos). From fe532a6fbc2a0ff70baf3b1cde18666a0f828ee2 Mon Sep 17 00:00:00 2001 From: "olivier.berger@bb28df880236e55a6bfeca92cc3de8ec424f2eba" <olivierberger@web> Date: Fri, 11 Sep 2015 15:31:26 +0000 Subject: [PATCH 5/6] Added a comment: Not completely fixed if git not installed on C: --- ..._d6f5ae804f2d8862c1c9b149f3626062._comment | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_7_d6f5ae804f2d8862c1c9b149f3626062._comment diff --git a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_7_d6f5ae804f2d8862c1c9b149f3626062._comment b/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_7_d6f5ae804f2d8862c1c9b149f3626062._comment new file mode 100644 index 0000000000..2762a77020 --- /dev/null +++ b/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_7_d6f5ae804f2d8862c1c9b149f3626062._comment @@ -0,0 +1,21 @@ +[[!comment format=mdwn + username="olivier.berger@bb28df880236e55a6bfeca92cc3de8ec424f2eba" + nickname="olivier.berger" + subject="Not completely fixed if git not installed on C:" + date="2015-09-11T15:31:25Z" + content=""" +Hi. + +I have the situation where my C: is too full, so I'm installing Git 2.5 on E: in E:\Program files\ instead of C:\Program files\ + +Then while installing git-annex, I'll install it in the same E:\Program files\git\ + +But then, the installer complains that git couldn't be found in c:, and whenever rsyncs are attempted, they fail with : +rsync failed -- run git annex again to resume file transfer + +I think there's probably some weirdness about the paths. + +I hope this is easy to reproduce and fix. + +Thanks in advance. +"""]] From 61ca4b6ea1171dd3687844753907cc5cacb56570 Mon Sep 17 00:00:00 2001 From: "olivier.berger@bb28df880236e55a6bfeca92cc3de8ec424f2eba" <olivierberger@web> Date: Fri, 11 Sep 2015 15:42:18 +0000 Subject: [PATCH 6/6] Added a comment: Maybe Git 2.5 must be installed only as 32 bit ? --- ...mment_8_d108cb76c69d5b5d1aa897607339623f._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_8_d108cb76c69d5b5d1aa897607339623f._comment diff --git a/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_8_d108cb76c69d5b5d1aa897607339623f._comment b/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_8_d108cb76c69d5b5d1aa897607339623f._comment new file mode 100644 index 0000000000..f7e13da8f6 --- /dev/null +++ b/doc/bugs/Windows:_git_annex_get_fails_with_rsync:_Failed_to_exec_ssh/comment_8_d108cb76c69d5b5d1aa897607339623f._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="olivier.berger@bb28df880236e55a6bfeca92cc3de8ec424f2eba" + nickname="olivier.berger" + subject="Maybe Git 2.5 must be installed only as 32 bit ?" + date="2015-09-11T15:42:18Z" + content=""" +It seems to me the problem actually lies in that I installed the 64 bits version of Git 2.5, as I've tried to install everything on c:\ and the problem still isn't solved. But I think that the fact that the installer complains about Git not in Program Files(x86) is linked to 32/64 bits mismatch. + +Once I'm installing Git 2.5 32 bits (even if my system runs Windows 7 64 bits), things are back to normal. + +Hope this helps. +"""]]