diff options
author | 2013-05-20 17:13:17 -0400 | |
---|---|---|
committer | 2013-05-20 17:13:17 -0400 | |
commit | bd02fe9ffd3222f5bcee7e173dbd0e5caa1e955c (patch) | |
tree | dd0b90b91db74b660bc10fa2e822dca6854e914e | |
parent | 5ac043c2fc4bf48029beb3af306499eeec3102dc (diff) | |
parent | e5c14ff185ff09c57bc6294e49726b2e56c81c22 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
2 files changed, 69 insertions, 0 deletions
diff --git a/doc/bugs/Assistant_doesn__39__t_actually_sync_file_contents_by_default/comment_7_8acb66850e5db8337cf3f2b2dd236ccc._comment b/doc/bugs/Assistant_doesn__39__t_actually_sync_file_contents_by_default/comment_7_8acb66850e5db8337cf3f2b2dd236ccc._comment new file mode 100644 index 000000000..8bd901688 --- /dev/null +++ b/doc/bugs/Assistant_doesn__39__t_actually_sync_file_contents_by_default/comment_7_8acb66850e5db8337cf3f2b2dd236ccc._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY" + nickname="Pedro" + subject="comment 7" + date="2013-05-20T19:52:30Z" + content=""" +Your example is pretty much what I've done. I'll enable a debug log as soon as possible. By the away \"git annex assistant --foreground\" still logs to .git/annex/daemon.log instead of stdout/stderr, which I assume was not the intended behavior. + +This bug was indeed about the assistant not syncing, the comments about the broken symlinks were just in response to edheil's comment. I can post a separate bug report about this but the reason I don't think this should be default behavior is that it breaks several simple uses of git-annex. One simple example is using it to store your configs across machines (things like .bashrc). If at any point the git-annex can't sync a file (a network problem or ssh breakage or whatever) but becomes aware of a file change (for example through xmpp) you now have a broken login shell. In general it breaks the user expectations of having a \"folder that just happens to also sync\" for something where his files randomly get replaced with strange broken things for odd technical reasons. +"""]] diff --git a/doc/bugs/Assistant_doesn__39__t_actually_sync_file_contents_by_default/comment_8_7eb530851ae6fa1a69813725c4e8fcec._comment b/doc/bugs/Assistant_doesn__39__t_actually_sync_file_contents_by_default/comment_8_7eb530851ae6fa1a69813725c4e8fcec._comment new file mode 100644 index 000000000..157923a1e --- /dev/null +++ b/doc/bugs/Assistant_doesn__39__t_actually_sync_file_contents_by_default/comment_8_7eb530851ae6fa1a69813725c4e8fcec._comment @@ -0,0 +1,59 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY" + nickname="Pedro" + subject="comment 8" + date="2013-05-20T19:59:22Z" + content=""" +Here's the same example you posted being followed by me and showing the problem + +[[!format sh \"\"\" +$mkdir 1 2 +$cd 1; git init; git-annex init; git annex direct; echo \"file added to 1\" > file_from_1; cd .. +Initialized empty Git repository in /home/pedrocr/Hacks/test-git-annex/1/.git/ +init ok +(Recording state in git...) +commit +# On branch master +# +# Initial commit +# +nothing to commit (create/copy files and use \"git add\" to track) +ok +direct ok +$cd 2; git init; git-annex init; git annex direct; echo \"file added to 2\" > file_from_2; cd .. +Initialized empty Git repository in /home/pedrocr/Hacks/test-git-annex/2/.git/ +init ok +(Recording state in git...) +commit +# On branch master +# +# Initial commit +# +nothing to commit (create/copy files and use \"git add\" to track) +ok +direct ok +$cd 1; git remote add 2 ssh://localhost/~pedrocr/Hacks/test-git-annex/2; git annex assistant; cd .. +$cd 2; git remote add 1 ssh://localhost/~pedrocr/Hacks/test-git-annex/1; git annex assistant; cd .. +(merging synced/git-annex into git-annex...) +$cd 1 +$ls +file_from_1 file_from_2 +$ls -la +total 20 +drwxrwxr-x 3 pedrocr pedrocr 4096 May 20 20:57 . +drwxrwxr-x 4 pedrocr pedrocr 4096 May 20 20:55 .. +-rw-r--r-- 1 pedrocr pedrocr 16 May 20 20:56 file_from_1 +lrwxrwxrwx 1 pedrocr pedrocr 180 May 20 20:57 file_from_2 -> .git/annex/objects/1P/8w/SHA256E-s16--b651aaa274225b617cb4d3033047ac6aee29dd6f2465f94ec38dc6630b7d48c8/SHA256E-s16--b651aaa274225b617cb4d3033047ac6aee29dd6f2465f94ec38dc6630b7d48c8 +drwxrwxr-x 9 pedrocr pedrocr 4096 May 20 20:57 .git +$cd .. +$cd 2 +$ls -la +total 20 +drwxrwxr-x 3 pedrocr pedrocr 4096 May 20 20:57 . +drwxrwxr-x 4 pedrocr pedrocr 4096 May 20 20:55 .. +lrwxrwxrwx 1 pedrocr pedrocr 180 May 20 20:57 file_from_1 -> .git/annex/objects/qQ/x9/SHA256E-s16--cca8b6c2db480aa680e12c48f471a351de69978c7665fac5b63d9a765f4c16f4/SHA256E-s16--cca8b6c2db480aa680e12c48f471a351de69978c7665fac5b63d9a765f4c16f4 +-rw-r--r-- 1 pedrocr pedrocr 16 May 20 20:56 file_from_2 +drwxrwxr-x 9 pedrocr pedrocr 4096 May 20 20:57 .git +$ +\"\"\"]] +"""]] |