From 2a75bbdaa071ecc59f8e36c57705256bb73bf5c8 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlu7K3h7Ry1uDAU_ERYGuqt0LoGNJqGuRo" Date: Mon, 4 Jun 2012 03:41:57 +0000 Subject: [PATCH 01/17] Added a forum post asking how to make locally cached files stay up to date across both rename and modify. --- ...es_due_to_external_modification__63__.mdwn | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 doc/forum/Automatic___96__git_annex_get__96___after_invalidation_of_local_files_due_to_external_modification__63__.mdwn diff --git a/doc/forum/Automatic___96__git_annex_get__96___after_invalidation_of_local_files_due_to_external_modification__63__.mdwn b/doc/forum/Automatic___96__git_annex_get__96___after_invalidation_of_local_files_due_to_external_modification__63__.mdwn new file mode 100644 index 0000000000..50518e33ad --- /dev/null +++ b/doc/forum/Automatic___96__git_annex_get__96___after_invalidation_of_local_files_due_to_external_modification__63__.mdwn @@ -0,0 +1,46 @@ +## Use case + +A laptop with a relatively small hard drive has copies of a subset of +all annexed files. When annexed files are changed externally and `git +annex sync` is run on the laptop, the stale local copies are +invalidated and their symlinks break. How can I automatically fetch +the updated versions of these previously locally-cached files? + +Because I only want a subset of files, I can't do + + git annex add --not --in here --and --in superset. + +Because files may be renamed, the +[[tips/automatically_getting_files_on_checkout/]] solution, by making +`dir` specify the subset, will require manually and redundantly +tracking renames. + +## Simple ( (?) ) feature addition to git-annex to support this + +When locally-cached files are invalidated by `git-annex sync`, +git-annex could notify the user, and give them the option to +`git-annex get` the invalidated files. Bonus points if the mechanism +allows this to be done at any point in the future, not just when +running `git-annex sync`. The idea is that git-annex could track +which files, previously cached locally, have been invalidated +*unintentionally* by syncs, and treat them differently from files, +previously cached locally, that have been *intentionally* dropped +using `git-annex drop` or `git-annex move`. + +## More generally + +The ability to specify a collection of files to always cache locally +(something like a numcopies.here=1), which is robust to renames, would +work. The "robust to renames" part seems tricky in git: whereas svn +attaches properties to files, and so properties are propagated by `svn +mv`, I believe git attributes are only specified by patterns in +.gitattributes files. + +## Related questions / possible approaches + +Other forum posts mention [[`git +subtree`|forum/git-subtree_support__63__/]] and [[sparse git +checkouts|forum/sparse_git_checkouts_with_annex/]], but I'm not +familiar with these features and from reading those questions it's +unclear if those approaches will work for me. Does anyone more +familiar see how to adapt one of those features to my use case? From 759b55a674a012c9c1c553e6b401ff1be14ef1b9 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus" Date: Mon, 4 Jun 2012 09:21:36 +0000 Subject: [PATCH 02/17] nothing too crazy, but it's the usual distro specific problems or architecture specific problems --- ...ave_the_32bit_version_installed__41__.mdwn | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 doc/bugs/subtle_build_issue_on_OSX_10.7_and_Haskell_Platform___40__if_you_have_the_32bit_version_installed__41__.mdwn diff --git a/doc/bugs/subtle_build_issue_on_OSX_10.7_and_Haskell_Platform___40__if_you_have_the_32bit_version_installed__41__.mdwn b/doc/bugs/subtle_build_issue_on_OSX_10.7_and_Haskell_Platform___40__if_you_have_the_32bit_version_installed__41__.mdwn new file mode 100644 index 0000000000..0414823f8b --- /dev/null +++ b/doc/bugs/subtle_build_issue_on_OSX_10.7_and_Haskell_Platform___40__if_you_have_the_32bit_version_installed__41__.mdwn @@ -0,0 +1,48 @@ +I've just come across a subtle build issue (as haskell-platform just +got updated, I thought I might give it a try) The scenario is + +* OSX 10.7 (everything is up to date with xcode etc... the usual) +* The 32bit version of Haskell Platform 2012.2 + +The issue is when libdiskfree.c is compiled and linked to git-annex, +OSX defaults to a 64bit binary, thus... + + Linking git-annex ... + ld: warning: ignoring file Utility/libdiskfree.o, file was built for unsupported file format which is not the architecture being linked (i386) + Undefined symbols for architecture i386: + "_diskfree", referenced from: + _UtilityziDiskFree_zdwa_info in DiskFree.o + ld: symbol(s) not found for architecture i386 + collect2: ld returned 1 exit status + make: *** [git-annex] Error 1 + +You can either compile up the c library in a 32bit mode if you have the 32bit +version of Haskell Platform installed as in the following example + + laplace:git-annex jtang$ cc -m32 -c -o Utility/libdiskfree.o Utility/libdiskfree.c + Utility/libdiskfree.c: In function ‘diskfree’: + Utility/libdiskfree.c:61: warning: ‘statfs64’ is deprecated (declared at /usr/include/sys/mount.h:379) + laplace:git-annex jtang$ make + ghc -O2 -Wall -ignore-package monads-fd -outputdir tmp -IUtility -DWITH_S3 --make git-annex Utility/libdiskfree.o + + Utility/Touch.hs:1:12: + Warning: -#include and INCLUDE pragmas are deprecated: They no longer have any effect + + Utility/Touch.hs:2:12: + Warning: -#include and INCLUDE pragmas are deprecated: They no longer have any effect + + Utility/Touch.hs:3:12: + Warning: -#include and INCLUDE pragmas are deprecated: They no longer have any effect + + Utility/Touch.hs:4:12: + Warning: -#include and INCLUDE pragmas are deprecated: They no longer have any effect + Linking git-annex ... + +Or else just install the 64bit haskell platform. I'm not too sure where +you would but the intelligence to detect 32 or 64 outputs from the +different compilers. I suspect checking what ghc outputs then putting in +the appropriate -m32 or -m64 for the c compiler is the right thing to do. +Or just telling users to use the 64bit version of the haskell platform? +It may also be possible to get osx's c compiler to output a universal binary +to give you everything, but that be going down the _being too platform +specific route_. From bc99cf6a5ad73ebc5036e46e9ef89a4cf806ac56 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ" Date: Mon, 4 Jun 2012 17:28:38 +0000 Subject: [PATCH 03/17] --- doc/forum/Debugging_Git_Annex.mdwn | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/forum/Debugging_Git_Annex.mdwn diff --git a/doc/forum/Debugging_Git_Annex.mdwn b/doc/forum/Debugging_Git_Annex.mdwn new file mode 100644 index 0000000000..fc4d829a2a --- /dev/null +++ b/doc/forum/Debugging_Git_Annex.mdwn @@ -0,0 +1,4 @@ +Hi, +May I know, how can I debug git-annex code. +I am new to Haskell Platform, I would like to know which IDE can be used to debug haskell code. +Thank You. From 9791d1dfe7083d1564d64a35cb2a37350dcc184f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Jun 2012 15:14:45 -0400 Subject: [PATCH 04/17] update; worked on watch branch today --- doc/design/assistant/inotify.mdwn | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/design/assistant/inotify.mdwn b/doc/design/assistant/inotify.mdwn index 6bb810a755..fd8d56e057 100644 --- a/doc/design/assistant/inotify.mdwn +++ b/doc/design/assistant/inotify.mdwn @@ -8,10 +8,15 @@ useful, it needs to: - notice deleted files and stage the deletion (tricky; there's a race with add..) - notice renamed files, auto-fix the symlink, and stage the new file location + **done** +- handle cases where directories are moved outside the repo, and stop + watching them **done** +- when a whole directory is deleted, stage removal of its + contents in the index **done** - periodically auto-commit staged changes (avoid autocommitting when lots of changes are coming in) - tunable delays before adding new files, etc -- honor .gitignore, not adding files it excludesa +- honor .gitignore, not adding files it excludes Also to do: From 9b40cd7461cc7b384f21a428a6b99f33301d67dd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Jun 2012 15:23:56 -0400 Subject: [PATCH 05/17] update --- doc/design/assistant/inotify.mdwn | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/doc/design/assistant/inotify.mdwn b/doc/design/assistant/inotify.mdwn index fd8d56e057..166e5b7cd4 100644 --- a/doc/design/assistant/inotify.mdwn +++ b/doc/design/assistant/inotify.mdwn @@ -1,22 +1,33 @@ Finish "git annex watch" command, which runs, in the background, watching via inotify for changes, and automatically annexing new files, etc. -There is a `watch` branch in git that adds such a command, although currently -it only handles adding new files, and nothing else. To make this really -useful, it needs to: +There is a `watch` branch in git that adds such a command. To make this +really useful, it needs to: -- notice deleted files and stage the deletion - (tricky; there's a race with add..) +- on startup, add any files that have appeared since last run **done** +- on startup, fix the symlinks for any renamed links **done** +- on startup, stage any files that have been deleted since last run + (seems to require a `git commit -a` on startup, or at least a + `git add --update`, which will notice deleted files) +- notice new files, and git annex add **done** - notice renamed files, auto-fix the symlink, and stage the new file location **done** - handle cases where directories are moved outside the repo, and stop watching them **done** -- when a whole directory is deleted, stage removal of its - contents in the index **done** +- when a whole directory is deleted or moved, stage removal of its + contents from the index **done** +- notice deleted files and stage the deletion + (tricky; there's a race with add since it replaces the file with a symlink..) - periodically auto-commit staged changes (avoid autocommitting when lots of changes are coming in) - tunable delays before adding new files, etc -- honor .gitignore, not adding files it excludes +- don't annex `.gitignore` and `.gitattributes` files, but do auto-stage + changes to them +- configurable option to only annex files meeting certian size or + filename criteria +- honor .gitignore, not adding files it excludes (difficult, probably + needs my own .gitignore parser to avoid excessive running of git commands + to check for ignored files) Also to do: From 2b269f32a10c63e089151d66020c7295b991393a Mon Sep 17 00:00:00 2001 From: "http://ciffer.net/~svend/" Date: Mon, 4 Jun 2012 19:40:08 +0000 Subject: [PATCH 06/17] Added a comment --- .../comment_2_e65cb478c57e70031b986ace2aafbfc0._comment | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/design/assistant/comment_2_e65cb478c57e70031b986ace2aafbfc0._comment diff --git a/doc/design/assistant/comment_2_e65cb478c57e70031b986ace2aafbfc0._comment b/doc/design/assistant/comment_2_e65cb478c57e70031b986ace2aafbfc0._comment new file mode 100644 index 0000000000..6c07b0e63b --- /dev/null +++ b/doc/design/assistant/comment_2_e65cb478c57e70031b986ace2aafbfc0._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="http://ciffer.net/~svend/" + subject="comment 2" + date="2012-06-04T19:40:06Z" + content=""" +I would find it useful if the watch command could 'git add' new files (instead of 'git annex add') for certain repositories. +"""]] From 0accc932cb88a79829cf0cfb3f27b16b46e33140 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Jun 2012 15:40:11 -0400 Subject: [PATCH 07/17] update --- doc/design/assistant.mdwn | 7 +++ doc/design/assistant/blog.mdwn | 1 + doc/design/assistant/blog/day_1__inotify.mdwn | 57 +++++++++++++++++++ doc/design/assistant/inotify.mdwn | 2 + 4 files changed, 67 insertions(+) create mode 100644 doc/design/assistant/blog.mdwn create mode 100644 doc/design/assistant/blog/day_1__inotify.mdwn diff --git a/doc/design/assistant.mdwn b/doc/design/assistant.mdwn index 7a720a5e08..69bf1da341 100644 --- a/doc/design/assistant.mdwn +++ b/doc/design/assistant.mdwn @@ -18,3 +18,10 @@ Feel free to chip in with comments! --[[Joey]] * [[desymlink]] * [[deltas]] * In my overfunded nighmares: [[Windows]] + +## blog + +I'll be blogging about my progress here on a semi-daily basis. Follow +along! + +[[!inline pages="page(design/assistant/blog/*)" show=30]] diff --git a/doc/design/assistant/blog.mdwn b/doc/design/assistant/blog.mdwn new file mode 100644 index 0000000000..f51da3db41 --- /dev/null +++ b/doc/design/assistant/blog.mdwn @@ -0,0 +1 @@ +See [[assistant]]. diff --git a/doc/design/assistant/blog/day_1__inotify.mdwn b/doc/design/assistant/blog/day_1__inotify.mdwn new file mode 100644 index 0000000000..9935698e06 --- /dev/null +++ b/doc/design/assistant/blog/day_1__inotify.mdwn @@ -0,0 +1,57 @@ +First day of [Kickstarter funded work](http://www.kickstarter.com/projects/joeyh/git-annex-assistant-like-dropbox-but-with-your-own/)! + +Worked on [[inotify]] today. The `watch` branch in git now does a pretty +good job of following changes made to the directory, annexing files +as they're added and staging other changes into git. Here's a quick +transcript of it in action: + + joey@gnu:~/tmp>mkdir demo + joey@gnu:~/tmp>cd demo + joey@gnu:~/tmp/demo>git init + Initialized empty Git repository in /home/joey/tmp/demo/.git/ + joey@gnu:~/tmp/demo>git annex init demo + init demo ok + (Recording state in git...) + joey@gnu:~/tmp/demo>git annex watch & + [1] 3284 + watch . (scanning...) (started) + joey@gnu:~/tmp/demo>dd if=/dev/urandom of=bigfile bs=1M count=2 + add ./bigfile 2+0 records in + 2+0 records out + 2097152 bytes (2.1 MB) copied, 0.835976 s, 2.5 MB/s + (checksum...) ok + (Recording state in git...) + joey@gnu:~/tmp/demo>ls -la bigfile + lrwxrwxrwx 1 joey joey 188 Jun 4 15:36 bigfile -> .git/annex/objects/Wx/KQ/SHA256-s2097152--e5ced5836a3f9be782e6da14446794a1d22d9694f5c85f3ad7220b035a4b82ee/SHA256-s2097152--e5ced5836a3f9be782e6da14446794a1d22d9694f5c85f3ad7220b035a4b82ee + joey@gnu:~/tmp/demo>git status -s + A bigfile + joey@gnu:~/tmp/demo>mkdir foo + joey@gnu:~/tmp/demo>mv bigfile foo + "del ./bigfile" + joey@gnu:~/tmp/demo>git status -s + AD bigfile + A foo/bigfile + +Due to Linux's inotify interface, this is suely some of the most subtle, +race-heavy code that I'll need to deal with while developing the git annex +assistant. But I can't start wading, need to jump off the deep end to make +progress! + +The hardest problem today involved the case where a directory is moved +outside of the tree that's being watched. Inotify will still send events +for such directories, but it doesn't make sense to continue to handle them. + +Ideally I'd stop inotify watching such directories, but a lot of state +would need to be maintained to know which inotify handle to stop watching. +(Seems like Haskell's inotify API makes this harder than it needs to be...) + +Instead, I put in a hack that will make it detect inotify events from +directories moved away, and ignore them. This is probably acceptable, +since this is an unusual edge case. + +---- + +The notable omission in the inotify code, which I'll work on next, is +staging deleting of files. This is tricky because adding a file to the +annex happens to cause a deletion event. I need to make sure there are no +races where that deletion event causes data loss. diff --git a/doc/design/assistant/inotify.mdwn b/doc/design/assistant/inotify.mdwn index 166e5b7cd4..e6335e0451 100644 --- a/doc/design/assistant/inotify.mdwn +++ b/doc/design/assistant/inotify.mdwn @@ -28,6 +28,8 @@ really useful, it needs to: - honor .gitignore, not adding files it excludes (difficult, probably needs my own .gitignore parser to avoid excessive running of git commands to check for ignored files) +- Possibly, when a directory is moved out of the annex location, + unannex its contents. Also to do: From e33f6bdfde536d0393b0857bca044150d756bc35 Mon Sep 17 00:00:00 2001 From: "http://ciffer.net/~svend/" Date: Mon, 4 Jun 2012 19:40:57 +0000 Subject: [PATCH 08/17] removed --- .../comment_2_e65cb478c57e70031b986ace2aafbfc0._comment | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 doc/design/assistant/comment_2_e65cb478c57e70031b986ace2aafbfc0._comment diff --git a/doc/design/assistant/comment_2_e65cb478c57e70031b986ace2aafbfc0._comment b/doc/design/assistant/comment_2_e65cb478c57e70031b986ace2aafbfc0._comment deleted file mode 100644 index 6c07b0e63b..0000000000 --- a/doc/design/assistant/comment_2_e65cb478c57e70031b986ace2aafbfc0._comment +++ /dev/null @@ -1,7 +0,0 @@ -[[!comment format=mdwn - username="http://ciffer.net/~svend/" - subject="comment 2" - date="2012-06-04T19:40:06Z" - content=""" -I would find it useful if the watch command could 'git add' new files (instead of 'git annex add') for certain repositories. -"""]] From dfb3182877e0072e8fffb2c1df1a01ad343cfdb3 Mon Sep 17 00:00:00 2001 From: "http://ciffer.net/~svend/" Date: Mon, 4 Jun 2012 19:42:08 +0000 Subject: [PATCH 09/17] Added a comment --- .../comment_1_3d3ff74447452d65c10ccc3dbfc323cd._comment | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/design/assistant/inotify/comment_1_3d3ff74447452d65c10ccc3dbfc323cd._comment diff --git a/doc/design/assistant/inotify/comment_1_3d3ff74447452d65c10ccc3dbfc323cd._comment b/doc/design/assistant/inotify/comment_1_3d3ff74447452d65c10ccc3dbfc323cd._comment new file mode 100644 index 0000000000..d042806a17 --- /dev/null +++ b/doc/design/assistant/inotify/comment_1_3d3ff74447452d65c10ccc3dbfc323cd._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="http://ciffer.net/~svend/" + subject="comment 1" + date="2012-06-04T19:42:07Z" + content=""" +I would find it useful if the watch command could 'git add' new files (instead of 'git annex add') for certain repositories. +"""]] From d08274a941ef92b7644293e050744e6c7af55fc1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Jun 2012 15:42:26 -0400 Subject: [PATCH 10/17] move --- doc/design/assistant.mdwn | 6 ++---- doc/design/assistant/blog.mdwn | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/design/assistant.mdwn b/doc/design/assistant.mdwn index 69bf1da341..1069cd8c6d 100644 --- a/doc/design/assistant.mdwn +++ b/doc/design/assistant.mdwn @@ -21,7 +21,5 @@ Feel free to chip in with comments! --[[Joey]] ## blog -I'll be blogging about my progress here on a semi-daily basis. Follow -along! - -[[!inline pages="page(design/assistant/blog/*)" show=30]] +I'll be blogging about my progress in the [[blog]] on a semi-daily basis. +Follow along! diff --git a/doc/design/assistant/blog.mdwn b/doc/design/assistant/blog.mdwn index f51da3db41..f099e48be0 100644 --- a/doc/design/assistant/blog.mdwn +++ b/doc/design/assistant/blog.mdwn @@ -1 +1 @@ -See [[assistant]]. +[[!inline pages="page(design/assistant/blog/*)" show=30]] From ecac13a11391443c2ac61f9b036be9f0da66ddcd Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Mon, 4 Jun 2012 19:45:00 +0000 Subject: [PATCH 11/17] Added a comment --- .../comment_2_6d3552414fdcc2ed3244567e6c67989d._comment | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/design/assistant/comment_2_6d3552414fdcc2ed3244567e6c67989d._comment diff --git a/doc/design/assistant/comment_2_6d3552414fdcc2ed3244567e6c67989d._comment b/doc/design/assistant/comment_2_6d3552414fdcc2ed3244567e6c67989d._comment new file mode 100644 index 0000000000..8056eec168 --- /dev/null +++ b/doc/design/assistant/comment_2_6d3552414fdcc2ed3244567e6c67989d._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + subject="comment 2" + date="2012-06-04T19:45:00Z" + content=""" +Jimmy, I hope to make it as easy as possible to install. I've been focusing on getting it directly into popular Linux distributions, rather than shipping my own binary. The OSX binary is static, and while I lack a OSX machine, I would like to get it easier to distribute to OSX users. +"""]] From 02dce20325a28973240733036c5ef00ead14ac04 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Mon, 4 Jun 2012 19:46:04 +0000 Subject: [PATCH 12/17] Added a comment --- .../comment_2_a3c0fa6d97397c508b4b8aafdcee8f6f._comment | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/design/assistant/inotify/comment_2_a3c0fa6d97397c508b4b8aafdcee8f6f._comment diff --git a/doc/design/assistant/inotify/comment_2_a3c0fa6d97397c508b4b8aafdcee8f6f._comment b/doc/design/assistant/inotify/comment_2_a3c0fa6d97397c508b4b8aafdcee8f6f._comment new file mode 100644 index 0000000000..13ee1523c3 --- /dev/null +++ b/doc/design/assistant/inotify/comment_2_a3c0fa6d97397c508b4b8aafdcee8f6f._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + subject="comment 2" + date="2012-06-04T19:46:03Z" + content=""" +I think it's already on the list: \"configurable option to only annex files meeting certian size or filename criteria\" -- files not meeting those criteria would just be git added. +"""]] From 39fb9db0433d66efff2085d3447bc465d8d29dc8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Jun 2012 15:47:19 -0400 Subject: [PATCH 13/17] add --- doc/design/assistant/inotify.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/design/assistant/inotify.mdwn b/doc/design/assistant/inotify.mdwn index e6335e0451..fe4c26d412 100644 --- a/doc/design/assistant/inotify.mdwn +++ b/doc/design/assistant/inotify.mdwn @@ -30,6 +30,8 @@ really useful, it needs to: to check for ignored files) - Possibly, when a directory is moved out of the annex location, unannex its contents. +- Gracefully handle when the default limit of 8192 inotified directories + is exceeded. This can be tuned by root, so help the user fix it. Also to do: From db2e6c8239d8f0e1c1593f95617b11db761dd27c Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Mon, 4 Jun 2012 19:49:46 +0000 Subject: [PATCH 14/17] Added a comment: This is not an easy question to answer... --- .../comment_1_ce63b2ee641a2338f1ad5ded9e6f09a8._comment | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/forum/Debugging_Git_Annex/comment_1_ce63b2ee641a2338f1ad5ded9e6f09a8._comment diff --git a/doc/forum/Debugging_Git_Annex/comment_1_ce63b2ee641a2338f1ad5ded9e6f09a8._comment b/doc/forum/Debugging_Git_Annex/comment_1_ce63b2ee641a2338f1ad5ded9e6f09a8._comment new file mode 100644 index 0000000000..84781a00a4 --- /dev/null +++ b/doc/forum/Debugging_Git_Annex/comment_1_ce63b2ee641a2338f1ad5ded9e6f09a8._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + subject="This is not an easy question to answer..." + date="2012-06-04T19:49:46Z" + content=""" +Do you have a bug in git-annex that you need fixed, or are you just curious? +"""]] From 04ddceece0db7aa0c9f1c2f45d1675133fdba6b1 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Mon, 4 Jun 2012 19:56:05 +0000 Subject: [PATCH 15/17] Added a comment --- .../comment_1_dab1099ee56541c194de319c593f1268._comment | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/Automatic___96__git_annex_get__96___after_invalidation_of_local_files_due_to_external_modification__63__/comment_1_dab1099ee56541c194de319c593f1268._comment diff --git a/doc/forum/Automatic___96__git_annex_get__96___after_invalidation_of_local_files_due_to_external_modification__63__/comment_1_dab1099ee56541c194de319c593f1268._comment b/doc/forum/Automatic___96__git_annex_get__96___after_invalidation_of_local_files_due_to_external_modification__63__/comment_1_dab1099ee56541c194de319c593f1268._comment new file mode 100644 index 0000000000..fa561ef04c --- /dev/null +++ b/doc/forum/Automatic___96__git_annex_get__96___after_invalidation_of_local_files_due_to_external_modification__63__/comment_1_dab1099ee56541c194de319c593f1268._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + subject="comment 1" + date="2012-06-04T19:56:05Z" + content=""" +Personally, I deal with this problem by having a directory, or directories where I put files that I want to have on my partial checkout laptop, and run `git annex get` in that directory. + +It's not a perfect solution, but I don't know that a perfect solution exists. +"""]] From fc66d642054175ef93359eff2ade6215374b66ee Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Mon, 4 Jun 2012 20:02:23 +0000 Subject: [PATCH 16/17] Added a comment --- .../comment_1_6208e70a21a048d5423926d16e32d421._comment | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/bugs/subtle_build_issue_on_OSX_10.7_and_Haskell_Platform___40__if_you_have_the_32bit_version_installed__41__/comment_1_6208e70a21a048d5423926d16e32d421._comment diff --git a/doc/bugs/subtle_build_issue_on_OSX_10.7_and_Haskell_Platform___40__if_you_have_the_32bit_version_installed__41__/comment_1_6208e70a21a048d5423926d16e32d421._comment b/doc/bugs/subtle_build_issue_on_OSX_10.7_and_Haskell_Platform___40__if_you_have_the_32bit_version_installed__41__/comment_1_6208e70a21a048d5423926d16e32d421._comment new file mode 100644 index 0000000000..11d135251d --- /dev/null +++ b/doc/bugs/subtle_build_issue_on_OSX_10.7_and_Haskell_Platform___40__if_you_have_the_32bit_version_installed__41__/comment_1_6208e70a21a048d5423926d16e32d421._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + subject="comment 1" + date="2012-06-04T20:02:23Z" + content=""" +Seems you built it using `make` .. could you try instead building with cabal, ie run `cabal install git-annex` or `cabal build` in the source tree. I think cabal will probably do the right thing. + +I could fix the Makefile, I suppose. What does this say: `ghc -e 'print System.Info.arch' +"""]] From e43e5134142344c4870b62af0efa6321d7783dcb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Jun 2012 16:16:50 -0400 Subject: [PATCH 17/17] typo --- doc/design/assistant/blog/day_1__inotify.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/design/assistant/blog/day_1__inotify.mdwn b/doc/design/assistant/blog/day_1__inotify.mdwn index 9935698e06..ca27a45861 100644 --- a/doc/design/assistant/blog/day_1__inotify.mdwn +++ b/doc/design/assistant/blog/day_1__inotify.mdwn @@ -32,7 +32,7 @@ transcript of it in action: AD bigfile A foo/bigfile -Due to Linux's inotify interface, this is suely some of the most subtle, +Due to Linux's inotify interface, this is surely some of the most subtle, race-heavy code that I'll need to deal with while developing the git annex assistant. But I can't start wading, need to jump off the deep end to make progress!