From 0b8a8c9b89a6315b9e93418e287582bc3063ee56 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkI9AR8BqG4RPw_Ov2lnDCJWMuM6WMRobQ" Date: Sun, 26 Jan 2014 22:51:30 +0000 Subject: [PATCH 1/4] Added a comment: Sorry to just be getting back... --- .../comment_10_2cd8ab86f498d6f676f859b552f831eb._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/sync/comment_10_2cd8ab86f498d6f676f859b552f831eb._comment diff --git a/doc/sync/comment_10_2cd8ab86f498d6f676f859b552f831eb._comment b/doc/sync/comment_10_2cd8ab86f498d6f676f859b552f831eb._comment new file mode 100644 index 0000000000..da4d019654 --- /dev/null +++ b/doc/sync/comment_10_2cd8ab86f498d6f676f859b552f831eb._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkI9AR8BqG4RPw_Ov2lnDCJWMuM6WMRobQ" + nickname="Dav" + subject="Sorry to just be getting back..." + date="2014-01-26T22:51:28Z" + content=""" +The URLs in question in this case were read-only github https URLs. In any case, my problems are solved by what you've already suggested. I think a less error-sounding response to read-only https repos sounds nice! +"""]] From 9a5d8bbdd9a15c04b4790fe53b7616cb61234a73 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnlotDRSLW2JVXY3SLSwhrcHteqUHhTtoY" Date: Mon, 27 Jan 2014 00:43:46 +0000 Subject: [PATCH 2/4] Added a comment: Not fixed. --- ..._86e26ee9ec90aa00f25392052737f0f0._comment | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 doc/bugs/__96__minimal_build__39____fails_due_to_missing_stm_dependency/comment_1_86e26ee9ec90aa00f25392052737f0f0._comment diff --git a/doc/bugs/__96__minimal_build__39____fails_due_to_missing_stm_dependency/comment_1_86e26ee9ec90aa00f25392052737f0f0._comment b/doc/bugs/__96__minimal_build__39____fails_due_to_missing_stm_dependency/comment_1_86e26ee9ec90aa00f25392052737f0f0._comment new file mode 100644 index 0000000000..7b86c07cce --- /dev/null +++ b/doc/bugs/__96__minimal_build__39____fails_due_to_missing_stm_dependency/comment_1_86e26ee9ec90aa00f25392052737f0f0._comment @@ -0,0 +1,36 @@ +[[!comment format=txt + username="https://www.google.com/accounts/o8/id?id=AItOawnlotDRSLW2JVXY3SLSwhrcHteqUHhTtoY" + nickname="Péter" + subject="Not fixed." + date="2014-01-27T00:43:45Z" + content=""" +It's still failing for me, on both i386 and amd64. + +Where exactly is it fixed? + +How is it possible to install git-annex using Cabal? + +http://stackoverflow.com/questions/21371272/cabal-missing-dependency-error + +$ cabal install git-annex --force-reinstalls --bindir=$HOME/bin.local -f\"-assistant -webapp -webdav -pairing -xmpp -dns\" +... +Configuring git-annex-5.20140116... +Building git-annex-5.20140116... +Preprocessing executable 'git-annex' for git-annex-5.20140116... + +Remote/External.hs:29:8: + Could not find module `Control.Concurrent.STM' + It is a member of the hidden package `stm-2.4.2'. + Perhaps you need to add `stm' to the build-depends in your .cabal file. + It is a member of the hidden package `stm-2.2.0.1'. + Perhaps you need to add `stm' to the build-depends in your .cabal file. + Use -v to see a list of the files searched for. +cabal: Error: some packages failed to install: +git-annex-5.20140116 failed during the building phase. The exception was: ExitFailure 1 +$ cabal install stm --force-reinstalls --bindir=$HOME/bin.local +Resolving dependencies... +All the requested packages are already installed: +stm-2.4.2 +Use --reinstall if you want to reinstall anyway. + +"""]] From 8e411771d12c01a633ac9281f884688533a9e909 Mon Sep 17 00:00:00 2001 From: "https://thargos.myopenid.com/" Date: Mon, 27 Jan 2014 12:47:03 +0000 Subject: [PATCH 3/4] typo --- doc/design/assistant/telehash.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/design/assistant/telehash.mdwn b/doc/design/assistant/telehash.mdwn index 777bce646e..ad692a4d12 100644 --- a/doc/design/assistant/telehash.mdwn +++ b/doc/design/assistant/telehash.mdwn @@ -33,7 +33,7 @@ git-annex (assistant) repositories. * XMPP pairing can also be used for telehash address discovery. (Note that MITM attacks are possible.) Is it worth keeping XMPP in git-annex just for this? -* Telehash addresses of repoitories can be communicated out of band (eg, +* Telehash addresses of repositories can be communicated out of band (eg, via an OTR session or gpg signed mail), and pasted into the webapp to initiate a repository pairing that then proceeds entirely over telehash. Once both sides do this, the pairing can proceed automatically. From 716fc7299636b11803b5e8d1103521b10e852209 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlUmrSFcLMuk2ny0QNlx4BosEuhG0ij0XQ" Date: Mon, 27 Jan 2014 16:44:22 +0000 Subject: [PATCH 4/4] Added a comment: Same thing using the assistant? --- ...comment_1_6bb1432d85faef2087d3744f43f5bf12._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex/comment_1_6bb1432d85faef2087d3744f43f5bf12._comment diff --git a/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex/comment_1_6bb1432d85faef2087d3744f43f5bf12._comment b/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex/comment_1_6bb1432d85faef2087d3744f43f5bf12._comment new file mode 100644 index 0000000000..eb8b81223e --- /dev/null +++ b/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex/comment_1_6bb1432d85faef2087d3744f43f5bf12._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlUmrSFcLMuk2ny0QNlx4BosEuhG0ij0XQ" + nickname="Gregor" + subject="Same thing using the assistant?" + date="2014-01-27T16:44:13Z" + content=""" +Hi can this also be done using the assistant. If I follow above instructions I end up with the directories being full of symlinks instead of the actual data. Using the assistant I get repositories that are still my original files (which I prefer). How can I sync two such repositories (created using existing data and the assistant)? + +Gregor +"""]]