From 621a1102464598bc0a3d747a9723ab2c2e57d5c5 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl9FMhhhM2sJ68Zjx_RmWd8cTdpI-mrkbE" Date: Tue, 4 Jun 2013 07:55:40 +0000 Subject: [PATCH 1/7] question about git and git-annex side by side, also with git-svn --- ..._git_and_git-annex_side_by_side:_with_git-svn.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/forum/using_git_and_git-annex_side_by_side:_with_git-svn.mdwn diff --git a/doc/forum/using_git_and_git-annex_side_by_side:_with_git-svn.mdwn b/doc/forum/using_git_and_git-annex_side_by_side:_with_git-svn.mdwn new file mode 100644 index 0000000000..d45fa0749e --- /dev/null +++ b/doc/forum/using_git_and_git-annex_side_by_side:_with_git-svn.mdwn @@ -0,0 +1,11 @@ +This question happens to have overlap with the recent http://git-annex.branchable.com/forum/help_running_git-annex_on_top_of_existing_repo/ + +I have a git repository which I want to keep in sync with an svn repository via git-svn. My git repository with annex stores large files (database dumps) in annex. I'm having trouble understanding how git-annex will hand off to git, and to git-svn. If I want to merge my repo to another git repo, or on to svn, do I have to do anything special to make sure my large files are not copied? + +I tested this by cloning the git repo. The symlinks are copied, and become broken as they obviously point to the annex directory which is not copied by the clone. + +The lesson seems to be: if you git clone or merge to a repo that is NOT annex enabled, you will end up with a normal git repo without any annex stuff. So as long as I don't explictly use git-annex, I can safely copy my other files to other repositories, and not worry about my annexed files coming along. Is this a safe conclusion for me to work with? Also, does anyone know of anything specific that would be different using git svn dcommit to merge my changes to an svn repo? + +Thanks. + +Hans From 780682cda13d6a9a52c11bdd81003f421b06fc4e Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl9FMhhhM2sJ68Zjx_RmWd8cTdpI-mrkbE" Date: Tue, 4 Jun 2013 07:56:45 +0000 Subject: [PATCH 2/7] removed --- ..._git_and_git-annex_side_by_side:_with_git-svn.mdwn | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 doc/forum/using_git_and_git-annex_side_by_side:_with_git-svn.mdwn diff --git a/doc/forum/using_git_and_git-annex_side_by_side:_with_git-svn.mdwn b/doc/forum/using_git_and_git-annex_side_by_side:_with_git-svn.mdwn deleted file mode 100644 index d45fa0749e..0000000000 --- a/doc/forum/using_git_and_git-annex_side_by_side:_with_git-svn.mdwn +++ /dev/null @@ -1,11 +0,0 @@ -This question happens to have overlap with the recent http://git-annex.branchable.com/forum/help_running_git-annex_on_top_of_existing_repo/ - -I have a git repository which I want to keep in sync with an svn repository via git-svn. My git repository with annex stores large files (database dumps) in annex. I'm having trouble understanding how git-annex will hand off to git, and to git-svn. If I want to merge my repo to another git repo, or on to svn, do I have to do anything special to make sure my large files are not copied? - -I tested this by cloning the git repo. The symlinks are copied, and become broken as they obviously point to the annex directory which is not copied by the clone. - -The lesson seems to be: if you git clone or merge to a repo that is NOT annex enabled, you will end up with a normal git repo without any annex stuff. So as long as I don't explictly use git-annex, I can safely copy my other files to other repositories, and not worry about my annexed files coming along. Is this a safe conclusion for me to work with? Also, does anyone know of anything specific that would be different using git svn dcommit to merge my changes to an svn repo? - -Thanks. - -Hans From 2a488351d73e0b09da11d84c0343049c1e48e8f4 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl9FMhhhM2sJ68Zjx_RmWd8cTdpI-mrkbE" Date: Tue, 4 Jun 2013 08:00:15 +0000 Subject: [PATCH 3/7] Added a comment: what about with git-svn? --- ...ment_2_b5e94c10ebbed9125c7e2332f75709ca._comment | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_2_b5e94c10ebbed9125c7e2332f75709ca._comment diff --git a/doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_2_b5e94c10ebbed9125c7e2332f75709ca._comment b/doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_2_b5e94c10ebbed9125c7e2332f75709ca._comment new file mode 100644 index 0000000000..ba321df6bc --- /dev/null +++ b/doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_2_b5e94c10ebbed9125c7e2332f75709ca._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawl9FMhhhM2sJ68Zjx_RmWd8cTdpI-mrkbE" + nickname="Hans" + subject="what about with git-svn?" + date="2013-06-04T08:00:15Z" + content=""" +I'm trying to wrap my head around a similar situation. +I've tested this by git cloning my repo; the symlinks are copied, and end up broken because the annex directory under .git doesn't exist in the new repo. + +So to be specific: can I conclude that when I use git to copy my repo, as long as I don't explicitly use git-annex in the process, I end up with a 'bare' git repo and I don't have to worry about my annexed files coming along? + +Also: anyone know of anything that would be different about using git-svn? (i.e. git svn dcommit to push my changes to an svn repo)? +"""]] From 2b97e875b0957f9240b43f73583bb2b4660b397f Mon Sep 17 00:00:00 2001 From: "http://edheil.wordpress.com/" Date: Tue, 4 Jun 2013 12:29:05 +0000 Subject: [PATCH 4/7] Added a comment --- ...comment_3_2b3b93bbc60fbc24d436231954d6822a._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_3_2b3b93bbc60fbc24d436231954d6822a._comment diff --git a/doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_3_2b3b93bbc60fbc24d436231954d6822a._comment b/doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_3_2b3b93bbc60fbc24d436231954d6822a._comment new file mode 100644 index 0000000000..8d2fd0dff1 --- /dev/null +++ b/doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_3_2b3b93bbc60fbc24d436231954d6822a._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://edheil.wordpress.com/" + ip="173.162.44.162" + subject="comment 3" + date="2013-06-04T12:29:04Z" + content=""" +As long as you're not using Direct Mode, then a git-annex repo is just an absolutely ordinary git repo, which happens to contain some symlinks that point to .git/annex/objects/* + + +"""]] From 77b05d9e124880b934bc9879891fa4265b547845 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM" Date: Tue, 4 Jun 2013 12:51:20 +0000 Subject: [PATCH 5/7] Added a comment --- .../comment_1_a42213a8cef71f2b54db18606028136d._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/design/assistant/blog/day_280__yesod/comment_1_a42213a8cef71f2b54db18606028136d._comment diff --git a/doc/design/assistant/blog/day_280__yesod/comment_1_a42213a8cef71f2b54db18606028136d._comment b/doc/design/assistant/blog/day_280__yesod/comment_1_a42213a8cef71f2b54db18606028136d._comment new file mode 100644 index 0000000000..3a99c22108 --- /dev/null +++ b/doc/design/assistant/blog/day_280__yesod/comment_1_a42213a8cef71f2b54db18606028136d._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM" + nickname="Bruno" + subject="comment 1" + date="2013-06-04T12:51:20Z" + content=""" +Congrats on the first year Joey! +"""]] From 1a3962c76e403e9e0421ce459d43b6f8b997b7dd Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM" Date: Tue, 4 Jun 2013 13:09:33 +0000 Subject: [PATCH 6/7] --- ...se_some_filenames_have_a_colon_in_them.mdwn | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 doc/bugs/Can__39__t_clone_on_Windows_because_some_filenames_have_a_colon_in_them.mdwn diff --git a/doc/bugs/Can__39__t_clone_on_Windows_because_some_filenames_have_a_colon_in_them.mdwn b/doc/bugs/Can__39__t_clone_on_Windows_because_some_filenames_have_a_colon_in_them.mdwn new file mode 100644 index 0000000000..2d03b7b571 --- /dev/null +++ b/doc/bugs/Can__39__t_clone_on_Windows_because_some_filenames_have_a_colon_in_them.mdwn @@ -0,0 +1,18 @@ +### Please describe the problem. +Some filenames in doc have a colon `(:)` in them and it seems it's not allowed on Windows. + +There's no hurry with this since I was able to clone the repo by doing a fork on Github and removing `doc/`. + +### What steps will reproduce the problem? + +[[!format sh """ +D:\tmp> git clone git://git-annex.branchable.com/ +Cloning into 'git-annex.branchable.com'... +remote: Counting objects: 72064, done. +remote: Compressing objects: 100% (18759/18759), done. +remote: Total 72064 (delta 52959), reused 72032 (delta 52944) +Receiving objects: 100% (72064/72064), 18.05 MiB | 2.39 MiB/s, done. +Resolving deltas: 100% (52959/52959), done. +fatal: cannot create directory at 'doc/bugs/3.20121112:_build_error_in_assistant': Invalid argument +D:\tmp> +"""]] From f04ed0795a36da1ad6d10b1593ba2a4576c682ce Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkYrMBMTCEFUKskhWGD-1pzcw2ITshsi_8" Date: Tue, 4 Jun 2013 23:10:04 +0000 Subject: [PATCH 7/7] Added a comment: Annex on OS X 10.6 --- .../comment_1_f2c4857b7b000e005f0c19279db14eaf._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/assistant/comment_1_f2c4857b7b000e005f0c19279db14eaf._comment diff --git a/doc/assistant/comment_1_f2c4857b7b000e005f0c19279db14eaf._comment b/doc/assistant/comment_1_f2c4857b7b000e005f0c19279db14eaf._comment new file mode 100644 index 0000000000..1ed185e48a --- /dev/null +++ b/doc/assistant/comment_1_f2c4857b7b000e005f0c19279db14eaf._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkYrMBMTCEFUKskhWGD-1pzcw2ITshsi_8" + nickname="Robert" + subject="Annex on OS X 10.6" + date="2013-06-04T23:10:03Z" + content=""" +I really hope they can get annex working on os x 10.6. This is a great effort. Thanks +"""]]