diff options
author | 2013-01-16 21:33:08 -0400 | |
---|---|---|
committer | 2013-01-16 21:33:08 -0400 | |
commit | 344755c7d7df9bbcfdc3187bde4215e9e32ff63f (patch) | |
tree | 8b4e615c75aa168170d1dfa081a861a926a5d13f | |
parent | fb442da95e9f60a7fd5ee9e6c46792d256d2dca0 (diff) | |
parent | 0dde687e60ec3ecc324ef5518ede7cc755878715 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
6 files changed, 96 insertions, 1 deletions
diff --git a/doc/bugs/Annex_thinks_file_exists_afer_being_dropped.mdwn b/doc/bugs/Annex_thinks_file_exists_afer_being_dropped.mdwn new file mode 100644 index 000000000..0f6248d4a --- /dev/null +++ b/doc/bugs/Annex_thinks_file_exists_afer_being_dropped.mdwn @@ -0,0 +1,27 @@ +#### What steps will reproduce the problem? + +I've posted some code here: + https://gist.github.com/4552036 + + +#### What is the expected output? What do you see instead? + +I think I've found three bugs. If they aren't bugs then there is a usage issue that could do with some documentation improvements. + +Problem 1 - With 3 local annexes git-annex doesn't seem to search properly for them (See code) + +Problem 2 - Even after a sync an annex thinks another (local) annex has a file, even after it has been dropped (See code) + +SCARY bug - `whereis` seems to think that a locally dropped file still exists (See code) + + +#### What version of git-annex are you using? On what operating system? + +git-annex version: 3.20130114 + +OS: OSX 10.6.8 + + +#### Please provide any additional information below. + + diff --git a/doc/bugs/Annex_thinks_file_exists_afer_being_dropped/comment_1_1d100441fd1ef529eb854b350fece9ee._comment b/doc/bugs/Annex_thinks_file_exists_afer_being_dropped/comment_1_1d100441fd1ef529eb854b350fece9ee._comment new file mode 100644 index 000000000..7ddc9d2dd --- /dev/null +++ b/doc/bugs/Annex_thinks_file_exists_afer_being_dropped/comment_1_1d100441fd1ef529eb854b350fece9ee._comment @@ -0,0 +1,29 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.154.7.238" + subject="comment 1" + date="2013-01-17T00:46:27Z" + content=""" +* Problem 1 - With 3 local annexes git-annex doesn't seem to search properly for them (See code) + +While test1 thinks test2 and test3 have the file, they don't; it was just dropped from them. So the check that the other repos have the file is done correctly here, and it correctly refuses to drop it. The message is confusing in that it suggests the repositories are not available. + +* Problem 2 - Even after a sync an annex thinks another (local) annex has a file, even after it has been dropped (See code) + +I have not fully analized this, but it does not have anything to do with direct mode, it's a location log bookeeping problem. + +The merge where this happens looks like this: + +<pre> + - 1358382328.617882s 0 620af8a6-603c-11e2-b332-f3ecf1856be4 (test2) + + 1358382324.420048s 1 620af8a6-603c-11e2-b332-f3ecf1856be4 (test2) + +1358382324.572356s 1 622cf3b6-603c-11e2-bb55-4fe0f1a02dee (test3) +++ 1358382328.472266s 0 622cf3b6-603c-11e2-bb55-4fe0f1a02dee (test3) +</pre> + +The first 2 lines are the problem, and in this merge, a newer line is deleted leaving behind an older, now incorrect line. Union merge should not be deleting lines at all, so this appears to be a bug in the union merge code. + +* SCARY bug - whereis seems to think that a locally dropped file still exists (See code) + +This is a consequence of problem 2; the bad location data gets synced back to test2. Of course fsck will fix this, and the location log's is not relied on when dropping files, so this cannot result in data loss at least. +"""]] diff --git a/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn b/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn index 856579f86..77551a793 100644 --- a/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn +++ b/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant.mdwn @@ -8,6 +8,6 @@ assistant, please instead fill in this poll on behalf of less technically adept friends or family -- what's preventing you from introducing them to the assistant? -[[!poll open=yes expandable=yes 7 "I'm using the assistant!" 16 "I need a Windows port" 29 "I need an Android port" 2 "I need an IPhone port (not holding my breath)" 2 "Well, it's still in beta..." 11 "I want to, but have not had the time to try it" 5 "Just inertia. I've got this dropbox/whatever that already works.." 1 "It's too hard to install (please say why in comments)" 2 "Perceived recent increase of bug reports and thus sitting it out." 22 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release." 6 "I haven't always well understood the differences between commandline operation & the assistant, so the differences would confuse me, and I found the command line more understandable & less scary. Now trying to learn to like & trust the assistant. :)" 10 "An Ubuntu PPA would be supercool! Thanks for your great work!!" 17 "Not yet in Debian sid amd64" 3 "Waiting for Fedora/CentOS rpm repository." 2 "throttling transfers, it upsets people when I saturate the connection" 2 "partial content" 1 "Not yet available in macports" 3 "No build yet for Nokia N9" 2 "Using only git-annex webapp to config does not seem to work: Create walkthough?" 5 "No build for OSX 10.6" 4 "Needs more focus on the UI." 1 "Just inertia. I don't have a Dropbox/whatever." 3 "Replaces files with a symlink mess." 2 "configurable option to only annex files meeting certian size or filename criteria" 2 "I'm really confused about how to make it sync with a remote NON-bare repository. I'm even afraid to try `git remote add`, since there is no clear method to completely forget a git-annex remote..." 2 "A build for te raspberry pi would be supercol!" 1 "Would be nice to exclude subfolders from the gui or through a config file" 1 "I wish I had transparently encrypted git repos in the cloud available, like jgit." 1 "too many inodes used in direct mode. maybe it's possible to keep more info as git objects instead?" 1 "I need to be able to restrict in which repo dirs changes get auto-committed" 1 "Provide .deb package"]] +[[!poll open=yes expandable=yes 7 "I'm using the assistant!" 17 "I need a Windows port" 29 "I need an Android port" 2 "I need an IPhone port (not holding my breath)" 2 "Well, it's still in beta..." 11 "I want to, but have not had the time to try it" 5 "Just inertia. I've got this dropbox/whatever that already works.." 1 "It's too hard to install (please say why in comments)" 2 "Perceived recent increase of bug reports and thus sitting it out." 22 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release." 6 "I haven't always well understood the differences between commandline operation & the assistant, so the differences would confuse me, and I found the command line more understandable & less scary. Now trying to learn to like & trust the assistant. :)" 10 "An Ubuntu PPA would be supercool! Thanks for your great work!!" 17 "Not yet in Debian sid amd64" 3 "Waiting for Fedora/CentOS rpm repository." 2 "throttling transfers, it upsets people when I saturate the connection" 2 "partial content" 1 "Not yet available in macports" 3 "No build yet for Nokia N9" 2 "Using only git-annex webapp to config does not seem to work: Create walkthough?" 5 "No build for OSX 10.6" 4 "Needs more focus on the UI." 1 "Just inertia. I don't have a Dropbox/whatever." 3 "Replaces files with a symlink mess." 2 "configurable option to only annex files meeting certian size or filename criteria" 2 "I'm really confused about how to make it sync with a remote NON-bare repository. I'm even afraid to try `git remote add`, since there is no clear method to completely forget a git-annex remote..." 2 "A build for te raspberry pi would be supercol!" 1 "Would be nice to exclude subfolders from the gui or through a config file" 1 "I wish I had transparently encrypted git repos in the cloud available, like jgit." 1 "too many inodes used in direct mode. maybe it's possible to keep more info as git objects instead?" 1 "I need to be able to restrict in which repo dirs changes get auto-committed" 1 "Provide .deb package"]] Feel free to write in your own reasons, or add a comment to give me more info. diff --git a/doc/forum/Building_a_Debian_package_of_git-annex.mdwn b/doc/forum/Building_a_Debian_package_of_git-annex.mdwn new file mode 100644 index 000000000..ee222df29 --- /dev/null +++ b/doc/forum/Building_a_Debian_package_of_git-annex.mdwn @@ -0,0 +1,27 @@ +I'd like to have a Debian/Ubuntu package of the latest git-annex (f.e. to have it installed systemwide). In the source I can find the debian/ folder with all needed information to build the package. But it looks like I don't have all needed dependencies on my Ubuntu 12.10: + + user@laptop(pc) ~/src/git/git-annex (git)-[master] % debuild -us -uc + dpkg-buildpackage -rfakeroot -D -us -uc + dpkg-buildpackage: source package git-annex + dpkg-buildpackage: source version 3.20130115 + dpkg-buildpackage: source changed by Joey Hess <joeyh@debian.org> + dpkg-source --before-build git-annex + dpkg-buildpackage: host architecture amd64 + dpkg-checkbuilddeps: Unmet build dependencies: libghc-dav-dev (>= 0.3) libghc-dbus-dev (>= 0.10.3) libghc-yesod-dev libghc-yesod-static-dev libghc-yesod-default-dev libghc-hamlet-dev libghc-clientsession-dev libghc-warp-dev libghc-wai-dev libghc-wai-logger-dev libghc-case-insensitive-dev libghc-http-types-dev libghc-blaze-builder-dev libghc-crypto-api-dev libghc-network-multicast-dev libghc-network-info-dev libghc-safesemaphore-dev libghc-network-protocol-xmpp-dev (>= 0.4.3-1+b1) libghc-gnutls-dev (>= 0.1.4) libghc-xml-types-dev + dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting + dpkg-buildpackage: warning: (Use -d flag to override.) + debuild: fatal error at line 1357: + dpkg-buildpackage -rfakeroot -D -us -uc failed + user@laptop(pc) ~/src/git/git-annex (git)-[master] % apt-get install libghc-dav-dev libghc-dbus-dev libghc-yesod-dev libghc-yesod-static-dev libghc-yesod- default-dev libghc-hamlet-dev libghc-clientsession-dev libghc-warp-dev libghc-wai-dev libghc-wai-logger-dev libghc-case-insensitive-dev libghc-http-types-dev libghc-blaze-builder-dev libghc-crypto-api-dev libghc-network-multicast-dev libghc-network-info-dev libghc-safesemaphore-dev libghc-network-protocol-xmpp-dev libghc-gnutls-dev libghc-xml-types-dev + Reading package lists... Done + Building dependency tree + Reading state information... Done + E: Unable to locate package libghc-dav-dev + E: Unable to locate package libghc-network-multicast-dev + E: Unable to locate package libghc-network-info-dev + E: Unable to locate package libghc-safesemaphore-dev + +How can I build the package? Or would it be possible for you to build the package and add it to the "Install" page (like the prebuilt linux tarball)? That would be great! + +Cheers and thanks for the hard work, +Tobias diff --git a/doc/forum/Building_a_Debian_package_of_git-annex/comment_1_0848513c46f3efa21bc34784554ae88a._comment b/doc/forum/Building_a_Debian_package_of_git-annex/comment_1_0848513c46f3efa21bc34784554ae88a._comment new file mode 100644 index 000000000..39790c5ff --- /dev/null +++ b/doc/forum/Building_a_Debian_package_of_git-annex/comment_1_0848513c46f3efa21bc34784554ae88a._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.154.7.238" + subject="comment 1" + date="2013-01-16T23:05:13Z" + content=""" +There is a package available already: <http://packages.debian.org/unstable/git-annex> + +This will install even on Debian stable, I think. +"""]] diff --git a/doc/forum/Running_assistant_on_a_server___40__no_X_available__41__.mdwn b/doc/forum/Running_assistant_on_a_server___40__no_X_available__41__.mdwn new file mode 100644 index 000000000..4116577bb --- /dev/null +++ b/doc/forum/Running_assistant_on_a_server___40__no_X_available__41__.mdwn @@ -0,0 +1,2 @@ +How can I run the assistant on a server and access the webinterface over the network from my client pc? +The use case I have in mind is that the server can automatically synchronize files, pushed over XMPP. |