diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-27 16:02:43 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-27 16:02:43 -0400 |
| commit | 724ddbe789e3587739b4bd9ac5ac5315822c86a2 (patch) | |
| tree | a95a7f80184bba1fa7fde51afb82fa5975d46e35 /doc | |
| parent | c1cc4d23de10e5669a42164b9145acea732be60d (diff) | |
| parent | 36e496b109647acb1de71d2caede50633789368e (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
3 files changed, 30 insertions, 0 deletions
diff --git a/doc/devblog/day_86__external_special_remote_implementation/comment_2_7b6e734f785fbd9db7883b63150023dc._comment b/doc/devblog/day_86__external_special_remote_implementation/comment_2_7b6e734f785fbd9db7883b63150023dc._comment new file mode 100644 index 000000000..7a0c85783 --- /dev/null +++ b/doc/devblog/day_86__external_special_remote_implementation/comment_2_7b6e734f785fbd9db7883b63150023dc._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.227" + subject="comment 2" + date="2013-12-27T19:12:17Z" + content=""" +That's on the TODO list and the protocol should be easily flexible enough to let it be added. The existing code to handle chunks is a bit of a mess though. +"""]] diff --git a/doc/forum/Tracking_a_directory_with_some_hg_and_git_repositories/comment_1_9fc3f6c2f7379755e0084a850fa9acd4._comment b/doc/forum/Tracking_a_directory_with_some_hg_and_git_repositories/comment_1_9fc3f6c2f7379755e0084a850fa9acd4._comment new file mode 100644 index 000000000..c61ea9a4d --- /dev/null +++ b/doc/forum/Tracking_a_directory_with_some_hg_and_git_repositories/comment_1_9fc3f6c2f7379755e0084a850fa9acd4._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.227" + subject="comment 1" + date="2013-12-27T19:05:59Z" + content=""" +I don't recommend using git-annex that way. + +.git directories cannot be checked into git, so will just be skipped. A hg repository will be checked in, but you can get into all kinds of bad situations if making commits to the \"same\" hg repository in two different locations. You will end up having to manually resolve conflicted merges to the files used by your distributed version control system, which defeats the point of using distributed version control. +"""]] diff --git a/doc/forum/Webapp_not_watching_repos/comment_1_02735050122afdb6498d91b462d32767._comment b/doc/forum/Webapp_not_watching_repos/comment_1_02735050122afdb6498d91b462d32767._comment new file mode 100644 index 000000000..9b0d61af1 --- /dev/null +++ b/doc/forum/Webapp_not_watching_repos/comment_1_02735050122afdb6498d91b462d32767._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.227" + subject="comment 1" + date="2013-12-27T19:02:28Z" + content=""" +Each separate repository needs to have a separate `git annex assistant` process handling it. + +Normally, these would all be started when `git annex assistant --autostart` is run, typically when you log into a desktop environment. + +So, on Linux, this is done via a .desktop file (or you can arrange for the command to be run as the right user at boot if not using a desktop); on OSX it's done via a .plist file. On Windows and Android, nothing handles the autostarting yet. +"""]] |