From 5797d287d9e9970836d88658b0a2ecfe26427e0d Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Sat, 16 Nov 2013 22:55:34 +0000 Subject: [PATCH 01/13] Added a comment --- .../comment_5_cab00b8fa195340f4d3fdaf5af975b57._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_5_cab00b8fa195340f4d3fdaf5af975b57._comment diff --git a/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_5_cab00b8fa195340f4d3fdaf5af975b57._comment b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_5_cab00b8fa195340f4d3fdaf5af975b57._comment new file mode 100644 index 0000000000..179a65a99a --- /dev/null +++ b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_5_cab00b8fa195340f4d3fdaf5af975b57._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.64" + subject="comment 5" + date="2013-11-16T22:55:34Z" + content=""" +Well, that's what should happen. What behavior are you seeing? What version of git-annex are you using? +"""]] From 1f801a986b6ebdc30a042af95f3d779b7efd2c11 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 16 Nov 2013 22:58:15 +0000 Subject: [PATCH 02/13] Added a comment --- ...t_6_e24df9a1c68724a912b8ac6533d9bd25._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_6_e24df9a1c68724a912b8ac6533d9bd25._comment diff --git a/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_6_e24df9a1c68724a912b8ac6533d9bd25._comment b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_6_e24df9a1c68724a912b8ac6533d9bd25._comment new file mode 100644 index 0000000000..a28e947dda --- /dev/null +++ b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_6_e24df9a1c68724a912b8ac6533d9bd25._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="David" + ip="178.21.48.117" + subject="comment 6" + date="2013-11-16T22:58:15Z" + content=""" +Hello, + +Yes, meanwhile files started appearing. :) Maybe I just did not wait enough time. + +So, I have just one more question. Shall I set the remote ssh repositories to client or transfer? I read the docs and understand the difference, but in my case I simply cannot decide. + +Thanks a lot for your hard work and great support. + +David +"""]] From b8d9fd36ec782f72eb61a1a872478a1f1f36233e Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Sat, 16 Nov 2013 23:04:29 +0000 Subject: [PATCH 03/13] Added a comment --- .../comment_7_ace3dc7c60c710a04b0a587206b341c4._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_7_ace3dc7c60c710a04b0a587206b341c4._comment diff --git a/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_7_ace3dc7c60c710a04b0a587206b341c4._comment b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_7_ace3dc7c60c710a04b0a587206b341c4._comment new file mode 100644 index 0000000000..84fe6ef0d9 --- /dev/null +++ b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_7_ace3dc7c60c710a04b0a587206b341c4._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.64" + subject="comment 7" + date="2013-11-16T23:04:29Z" + content=""" +In your situation, you do not have or need a repository whose only job is to transfer files between two other client repositories. So the right choice for your repositories is client -- or something else possibly -- but almost certianly not transfer. +"""]] From c8680e0f591893343b0ed6b82bad88766895eefd Mon Sep 17 00:00:00 2001 From: David Date: Sat, 16 Nov 2013 23:09:32 +0000 Subject: [PATCH 04/13] Added a comment --- ...ent_8_9a96bc970a17ed62b0ceb7aa3f0a6f8b._comment | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_8_9a96bc970a17ed62b0ceb7aa3f0a6f8b._comment diff --git a/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_8_9a96bc970a17ed62b0ceb7aa3f0a6f8b._comment b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_8_9a96bc970a17ed62b0ceb7aa3f0a6f8b._comment new file mode 100644 index 0000000000..1d0f1db52c --- /dev/null +++ b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_8_9a96bc970a17ed62b0ceb7aa3f0a6f8b._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="David" + ip="178.21.48.117" + subject="comment 8" + date="2013-11-16T23:09:32Z" + content=""" +Okay. One last question. Could you please help me understand how this sync works now? + +So for example if I save a file on server1, it gets pushed to server2's repository. But how is it translated back to a normal file from the repository? + +And in this case will this file be on server2's repository as well (so are there 2 copies on server2, one in the repository and one human-readabl)? + +Thanks! +"""]] From 09e6c0b422019c8259128e3e732138baf120cbb1 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Sat, 16 Nov 2013 23:11:58 +0000 Subject: [PATCH 05/13] Added a comment --- .../comment_9_ea88e0696f6e25e6904248a323f6cc36._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_9_ea88e0696f6e25e6904248a323f6cc36._comment diff --git a/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_9_ea88e0696f6e25e6904248a323f6cc36._comment b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_9_ea88e0696f6e25e6904248a323f6cc36._comment new file mode 100644 index 0000000000..cafac10772 --- /dev/null +++ b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_9_ea88e0696f6e25e6904248a323f6cc36._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.64" + subject="comment 9" + date="2013-11-16T23:11:58Z" + content=""" +Since you created these repositories with the webapp, they default to using [[direct_mode]]. git-annex handles putting the files in place when they are transferred to the repository. Only 1 copy is made, there is no separate copy in the repository. +"""]] From c8d55b78a9b9a9df18db93d32128325057356b39 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 16 Nov 2013 23:15:49 +0000 Subject: [PATCH 06/13] Added a comment --- ..._10_533ade2215c879cd46782fd66a97b167._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_10_533ade2215c879cd46782fd66a97b167._comment diff --git a/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_10_533ade2215c879cd46782fd66a97b167._comment b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_10_533ade2215c879cd46782fd66a97b167._comment new file mode 100644 index 0000000000..ec7dc0f861 --- /dev/null +++ b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_10_533ade2215c879cd46782fd66a97b167._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="David" + ip="178.21.48.117" + subject="comment 10" + date="2013-11-16T23:15:49Z" + content=""" +Great. Understood. :) Thanks. + +Although there is one more thing that I don't really understand. Why do we need 2 repositories. In my mind (without knowing git) I thout it would work with one repository, where both server1 and server2 can upload/download files and they got synced through this. + + server1 <-> repository (somewhere, eother server1 or server2) <-> server2 + +Now they use different repositories and I don't get why. Also I don't get how conflict-handling can be done if there are 2 repositories for the 2 transfer-ways. + +Sorry to bother you with this. +"""]] From 2b5232889e92f477d68f856b5df5686310ce27bb Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Sat, 16 Nov 2013 23:25:26 +0000 Subject: [PATCH 07/13] Added a comment --- ...omment_11_c9ae51d7b772cf7a91d90925f74d2b60._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_11_c9ae51d7b772cf7a91d90925f74d2b60._comment diff --git a/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_11_c9ae51d7b772cf7a91d90925f74d2b60._comment b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_11_c9ae51d7b772cf7a91d90925f74d2b60._comment new file mode 100644 index 0000000000..f614d066dc --- /dev/null +++ b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_11_c9ae51d7b772cf7a91d90925f74d2b60._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.64" + subject="comment 11" + date="2013-11-16T23:25:26Z" + content=""" +When using git, each place you access your files is a separate repository. Thus, you have: + +server1 (repository) <--> server2 (repository) +"""]] From 4ec7ffec421bd32fde0ec1c72c49d7084a5d0db6 Mon Sep 17 00:00:00 2001 From: stoile Date: Sun, 17 Nov 2013 10:27:13 +0000 Subject: [PATCH 08/13] Added a comment: Bug report answering my question --- .../comment_6_19272edbabbdf1a242f9206877f71d99._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_6_19272edbabbdf1a242f9206877f71d99._comment diff --git a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_6_19272edbabbdf1a242f9206877f71d99._comment b/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_6_19272edbabbdf1a242f9206877f71d99._comment new file mode 100644 index 0000000000..d83a0bdb61 --- /dev/null +++ b/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_6_19272edbabbdf1a242f9206877f71d99._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="stoile" + ip="2a01:198:242:0:219:66ff:fef2:c021" + subject="Bug report answering my question" + date="2013-11-17T10:27:13Z" + content=""" +Seems I have missed >http://git-annex.branchable.com/bugs/not_possible_to_have_annex_on_a_separate_filesystem/>. +"""]] From a7e9338d8c730a00b78907002286c0963bcc7274 Mon Sep 17 00:00:00 2001 From: stoile Date: Sun, 17 Nov 2013 10:27:51 +0000 Subject: [PATCH 09/13] removed --- .../comment_6_19272edbabbdf1a242f9206877f71d99._comment | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_6_19272edbabbdf1a242f9206877f71d99._comment diff --git a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_6_19272edbabbdf1a242f9206877f71d99._comment b/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_6_19272edbabbdf1a242f9206877f71d99._comment deleted file mode 100644 index d83a0bdb61..0000000000 --- a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_6_19272edbabbdf1a242f9206877f71d99._comment +++ /dev/null @@ -1,8 +0,0 @@ -[[!comment format=mdwn - username="stoile" - ip="2a01:198:242:0:219:66ff:fef2:c021" - subject="Bug report answering my question" - date="2013-11-17T10:27:13Z" - content=""" -Seems I have missed >http://git-annex.branchable.com/bugs/not_possible_to_have_annex_on_a_separate_filesystem/>. -"""]] From a4d83d55cf7195c570e338c8ec36fdd92c1f152f Mon Sep 17 00:00:00 2001 From: stoile Date: Sun, 17 Nov 2013 10:28:40 +0000 Subject: [PATCH 10/13] Added a comment: Bug report answering my question --- .../comment_6_46bd45fdc25d9c583f4ebe3a9730ab9f._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_6_46bd45fdc25d9c583f4ebe3a9730ab9f._comment diff --git a/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_6_46bd45fdc25d9c583f4ebe3a9730ab9f._comment b/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_6_46bd45fdc25d9c583f4ebe3a9730ab9f._comment new file mode 100644 index 0000000000..0c0e3e4957 --- /dev/null +++ b/doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk/comment_6_46bd45fdc25d9c583f4ebe3a9730ab9f._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="stoile" + ip="2a01:198:242:0:219:66ff:fef2:c021" + subject="Bug report answering my question" + date="2013-11-17T10:28:40Z" + content=""" +My question was answered in . +"""]] From 7f39efc0f4bb480b7e26a316803419891e0b9233 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmL8pteP2jbYJUn1M3CbeLDvz2SWAA1wtg" Date: Sun, 17 Nov 2013 17:01:15 +0000 Subject: [PATCH 11/13] Added a comment --- .../comment_24_c73e1277c5f284b1019362fb2bef94a8._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/git_annex_doesn__39__t_work_in_Max_OS_X_10.9/comment_24_c73e1277c5f284b1019362fb2bef94a8._comment diff --git a/doc/bugs/git_annex_doesn__39__t_work_in_Max_OS_X_10.9/comment_24_c73e1277c5f284b1019362fb2bef94a8._comment b/doc/bugs/git_annex_doesn__39__t_work_in_Max_OS_X_10.9/comment_24_c73e1277c5f284b1019362fb2bef94a8._comment new file mode 100644 index 0000000000..c3a0d3bec3 --- /dev/null +++ b/doc/bugs/git_annex_doesn__39__t_work_in_Max_OS_X_10.9/comment_24_c73e1277c5f284b1019362fb2bef94a8._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmL8pteP2jbYJUn1M3CbeLDvz2SWAA1wtg" + nickname="Kristian" + subject="comment 24" + date="2013-11-17T17:01:14Z" + content=""" +Thanks Joey! It works great +"""]] From 6fe0b7a582e397e2e67c0a36b3fd901c603c37ce Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo" Date: Sun, 17 Nov 2013 17:28:06 +0000 Subject: [PATCH 12/13] Added a comment --- .../comment_4_a07472338a08c068a9b88b2176fc2bee._comment | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/speed_up_assistant_startup_on_large_repositories/comment_4_a07472338a08c068a9b88b2176fc2bee._comment diff --git a/doc/forum/speed_up_assistant_startup_on_large_repositories/comment_4_a07472338a08c068a9b88b2176fc2bee._comment b/doc/forum/speed_up_assistant_startup_on_large_repositories/comment_4_a07472338a08c068a9b88b2176fc2bee._comment new file mode 100644 index 0000000000..41e69ab1e4 --- /dev/null +++ b/doc/forum/speed_up_assistant_startup_on_large_repositories/comment_4_a07472338a08c068a9b88b2176fc2bee._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo" + nickname="Tobias" + subject="comment 4" + date="2013-11-17T17:28:06Z" + content=""" +The mentioned repository is stored on spinning disk. +Maybe it would help to store the .git directory on an SSD, but I'm not sure how to do it. +"""]] From e8837912abc3920048d58a9aafd184a42b137c23 Mon Sep 17 00:00:00 2001 From: "http://mike.magin.org/" Date: Sun, 17 Nov 2013 18:28:53 +0000 Subject: [PATCH 13/13] --- ...y_large_and_not_inherently_compressed.mdwn | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 doc/bugs/OSX_.dmg_unnecessarily_large_and_not_inherently_compressed.mdwn diff --git a/doc/bugs/OSX_.dmg_unnecessarily_large_and_not_inherently_compressed.mdwn b/doc/bugs/OSX_.dmg_unnecessarily_large_and_not_inherently_compressed.mdwn new file mode 100644 index 0000000000..010bf91152 --- /dev/null +++ b/doc/bugs/OSX_.dmg_unnecessarily_large_and_not_inherently_compressed.mdwn @@ -0,0 +1,66 @@ +### Please describe the problem. + +The .dmg the OSX build is distributed in is unnecessarily large (fixed size) and is externally compressed. + +I did a quick survey of .dmg images used for distributing other pieces of software which I had downloaded to my Mac, and most of them seem to be the UDBZ or the (older) UDZO formats which are internally compressed with bzip2 or zlib. According to "man hdiutil", the UDBZ format is supported since 10.4 (Tiger). + +Below are a pair of patches: first to enable "make clean" to work on OSX, second to build the .dmg in the UDBZ format and without an explicit size (it seems to infer a correct size). When I tested building it, it results in a .dmg which is slightly smaller than the old .dmg.bz2 + +(This will also require a change to remove the .bz2 from the download links elsewhere in the wiki.) + +
+From 251e23bbe66cc63e98089554f91b2528a097e818 Mon Sep 17 00:00:00 2001
+From: Mike Magin 
+Date: Sun, 17 Nov 2013 08:11:05 -0800
+Subject: [PATCH 1/2] Add explicit path to find invocation in "make clean" target.
+
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3f3ed35..5a0cebb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -83,8 +83,8 @@ clean:
+ 		Setup Build/InstallDesktopFile Build/EvilSplicer \
+ 		Build/Standalone Build/OSXMkLibs \
+ 		git-union-merge git-recover-repository
+-	find -name \*.o -exec rm {} \;
+-	find -name \*.hi -exec rm {} \;
++	find . -name \*.o -exec rm {} \;
++	find . -name \*.hi -exec rm {} \;
+ 
+ Build/InstallDesktopFile: Build/InstallDesktopFile.hs
+ 	$(GHC) --make $@
+-- 
+1.8.4.3
+
+From e66f767893b5ef70cbf69d420cb589071f88c784 Mon Sep 17 00:00:00 2001
+From: Mike Magin 
+Date: Sun, 17 Nov 2013 08:40:07 -0800
+Subject: [PATCH 2/2] Change .dmg build to include compression and not be fixed size.
+
+---
+ Makefile | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 5a0cebb..b6ac549 100644
+--- a/Makefile
++++ b/Makefile
+@@ -162,10 +162,9 @@ osxapp: Build/Standalone Build/OSXMkLibs
+ 
+ 	./Build/OSXMkLibs $(OSXAPP_BASE)
+ 	rm -f tmp/git-annex.dmg
+-	hdiutil create -size 640m -format UDRW -srcfolder tmp/build-dmg \
++	hdiutil create -format UDBZ -srcfolder tmp/build-dmg \
+ 		-volname git-annex -o tmp/git-annex.dmg
+ 	rm -f tmp/git-annex.dmg.bz2
+-	bzip2 --fast tmp/git-annex.dmg
+ 
+ ANDROID_FLAGS?=-f-XMPP
+ # Cross compile for Android.
+-- 
+1.8.4.3
+