From cd3ff86e584af7302d5a50dc98cc503b22f11103 Mon Sep 17 00:00:00 2001 From: xloem Date: Sun, 25 Dec 2016 01:29:15 +0000 Subject: [PATCH 1/5] Update text with link to assistant/quickstart --- doc/workflow.mdwn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/workflow.mdwn b/doc/workflow.mdwn index 042b4bab43..6c5b152b0e 100644 --- a/doc/workflow.mdwn +++ b/doc/workflow.mdwn @@ -21,8 +21,7 @@ around while the webapp is running, etc. The [[`git annex webapp`|git-annex-webapp]] command launches a local web server which serves a graphical user interface and automatically manages git annex. It will attempt to guide you through the whole process and do -everything for you. The intent is that no other commands are -needed. This should be run on every machine that may produce file changes. +everything for you. [[You do not even need to type the command|assistant/quickstart]]. This should be run on every machine that may produce file changes. When you move files into or out of your repository folder, the changes should be recorded and automatically propagated to other connected machines. # 2. [[git annex assistant|git-annex-assistant]] without the webapp From 1baf3b3226ad65a1e610a39ccad534586b353c94 Mon Sep 17 00:00:00 2001 From: xloem Date: Sun, 25 Dec 2016 01:36:30 +0000 Subject: [PATCH 2/5] oops, manual reflow --- doc/workflow.mdwn | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/workflow.mdwn b/doc/workflow.mdwn index 6c5b152b0e..1855649c19 100644 --- a/doc/workflow.mdwn +++ b/doc/workflow.mdwn @@ -21,7 +21,11 @@ around while the webapp is running, etc. The [[`git annex webapp`|git-annex-webapp]] command launches a local web server which serves a graphical user interface and automatically manages git annex. It will attempt to guide you through the whole process and do -everything for you. [[You do not even need to type the command|assistant/quickstart]]. This should be run on every machine that may produce file changes. When you move files into or out of your repository folder, the changes should be recorded and automatically propagated to other connected machines. +everything for you. [[You do not even need to type the command. +|assistant/quickstart]] This should be run on every machine that may +produce file changes. When you move files into or out of your repository +folder, git-annex should record the changes and automatically propagate +them to other connected machines. # 2. [[git annex assistant|git-annex-assistant]] without the webapp From 6af17e66ef0972f42368287624f1e136193ae127 Mon Sep 17 00:00:00 2001 From: Asureus Date: Sun, 25 Dec 2016 14:26:02 +0000 Subject: [PATCH 3/5] --- ...pled_filesystem_direct_mode_sync_loop.mdwn | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 doc/bugs/crippled_filesystem_direct_mode_sync_loop.mdwn diff --git a/doc/bugs/crippled_filesystem_direct_mode_sync_loop.mdwn b/doc/bugs/crippled_filesystem_direct_mode_sync_loop.mdwn new file mode 100644 index 0000000000..d7db94c8cb --- /dev/null +++ b/doc/bugs/crippled_filesystem_direct_mode_sync_loop.mdwn @@ -0,0 +1,74 @@ +### Please describe the problem. +Two direct mode repos both on crippled filesystem (NTFS), although no file is modified, each "git annex sync" command will generate a new commit on master branch, which makes "git log" grow fast. + +### What steps will reproduce the problem? +Run the script below on NTFS filesystem + +### What version of git-annex are you using? On what operating system? +I tried multiple combination: +git version from 2.7.4 to 2.11.0; +git-annex version from 5.20150812 to 6.20161211; +OS includes ubuntu xenial&yakkety and Windows 10; +As long as the script is run on NTFS filesystem it reproudces the problem. +However, on non crippled file system the script works without problem. + +### Please provide any additional information below. + +[[!format sh """ +# If you can, paste a complete transcript of the problem occurring here. +# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log +mkdir a +cd a +git init +git annex init first +git annex direct +echo foo > 1.txt +git annex add . +git annex sync +cd .. +git clone a b +cd b +git annex init second +git annex direct +git annex sync +cd ../a +git remote add second ../b +git annex sync +echo bar > 2.txt +git annex add 2.txt +git annex sync +cd ../b +git annex sync +cd ../a +git annex sync +cd ../b +git annex sync +cd ../a +git annex sync +cd ../b +git annex sync +cd ../a +git annex sync +cd ../b +git annex sync +cd ../a +git annex sync +cd ../b +git annex sync +cd ../a +git annex sync +cd ../b +git annex sync +cd ../a +git annex sync +cd ../b +git annex sync +git log | grep refs/heads/synced/master | wc + + +# End of transcript or log. +"""]] + +### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) + +I'm new to git-annex and immediately astonished by its unique strength. I fit the Archivist use case, and this could be the solution I wanted for so long. I'm planning to deploy it on 2 Windows boxes and several USB disks, all of them on NTFS. I learnt the idea that v6 repo is not yet good for Win/NTFS (double disk space), so I guess direct mode is the way to go? I have already got some test repos running and practicing, indeed this sync loop problem is the only remaining case I'm not confident with. Is it a bug or some safety measure feature? Am I good to go? Thanks and oh, Merry X'mas! From c3290d202a9293ee3d3e06bb841f77f99d5d2a84 Mon Sep 17 00:00:00 2001 From: Asureus Date: Sun, 25 Dec 2016 14:46:46 +0000 Subject: [PATCH 4/5] Added a comment: one more thing --- .../comment_1_54fbe98e49d949cb6bed6122fcaec048._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/crippled_filesystem_direct_mode_sync_loop/comment_1_54fbe98e49d949cb6bed6122fcaec048._comment diff --git a/doc/bugs/crippled_filesystem_direct_mode_sync_loop/comment_1_54fbe98e49d949cb6bed6122fcaec048._comment b/doc/bugs/crippled_filesystem_direct_mode_sync_loop/comment_1_54fbe98e49d949cb6bed6122fcaec048._comment new file mode 100644 index 0000000000..baa1bb91ed --- /dev/null +++ b/doc/bugs/crippled_filesystem_direct_mode_sync_loop/comment_1_54fbe98e49d949cb6bed6122fcaec048._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="Asureus" + avatar="http://cdn.libravatar.org/avatar/f544d481d1e5adcd3b68c27d18680535" + subject="one more thing" + date="2016-12-25T14:46:46Z" + content=""" +Forgot to mention it, \"git annex test\" never passed on my Windows setup, always got 10-20 failed tests. Is that OK? +"""]] From d698e440b7a5989eb2fac85e1262aa62c26e9e38 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~felixonmars" Date: Tue, 27 Dec 2016 09:06:45 +0000 Subject: [PATCH 5/5] --- ...ed_to_compile_with_shakespeare_2.0.12.mdwn | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 doc/bugs/Failed_to_compile_with_shakespeare_2.0.12.mdwn diff --git a/doc/bugs/Failed_to_compile_with_shakespeare_2.0.12.mdwn b/doc/bugs/Failed_to_compile_with_shakespeare_2.0.12.mdwn new file mode 100644 index 0000000000..e7b20f6c5b --- /dev/null +++ b/doc/bugs/Failed_to_compile_with_shakespeare_2.0.12.mdwn @@ -0,0 +1,26 @@ + + [365 of 557] Compiling Assistant.WebApp.Form ( Assistant/WebApp/Form.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Form.o ) + + Assistant/WebApp/Form.hs:61:60: error: + * Exception when trying to run compile-time code: + " + #{toggle} +
+ ^{note} + " (line 2, column 45): + unexpected "d" + expecting ">" + CallStack (from HasCallStack): + error, called at ./Text/Hamlet.hs:421:21 in shakespeare-2.0.12-4ppL9xZ9sKD6RsPGnrhiq:Text.Hamlet + Code: Language.Haskell.TH.Quote.quoteExp + whamlet + "\n\ + \#{toggle}\n\ + \
\n\ + \ ^{note}\n" + * In the quasi-quotation: + [whamlet| + #{toggle} +
+ ^{note} + |]