diff --git a/doc/bugs/How_to_git_union-merge__63__/comment_2_22701b82e8d53acff66ddea5bf9448bf._comment b/doc/bugs/How_to_git_union-merge__63__/comment_2_22701b82e8d53acff66ddea5bf9448bf._comment new file mode 100644 index 0000000000..63edd6f659 --- /dev/null +++ b/doc/bugs/How_to_git_union-merge__63__/comment_2_22701b82e8d53acff66ddea5bf9448bf._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="nobodyinperson" + avatar="http://cdn.libravatar.org/avatar/736a41cd4988ede057bae805d000f4f5" + subject="comment 2" + date="2023-11-21T20:20:13Z" + content=""" +It sounds promising as an automatic merge conflict resolver that I'd like to fall back to for non-annexed file conflicts. I don't really know how do achieve that manually. If it's easily possible in another way, I'll try that. +"""]] diff --git a/doc/forum/git-remote-gcrypt_and_rsyncd.mdwn b/doc/forum/git-remote-gcrypt_and_rsyncd.mdwn new file mode 100644 index 0000000000..bba80cd66c --- /dev/null +++ b/doc/forum/git-remote-gcrypt_and_rsyncd.mdwn @@ -0,0 +1,32 @@ +In an attempt to simplify my setup, I have been trying to setup an encrypted repository on a `rsyncd`-based server via [`git-remote-gcrypt`](https://git-annex.branchable.com/tips/fully_encrypted_git_repositories_with_gcrypt/), which would house the file history and the annexed files themselves. I cannot provide an SSH connection to the server, so the `rsyncd` method seemed appealing. + +Using the rsync format url with "::" to signal the rsyncd method, the connection seems successful, but the initialization does not complete. + +``` +git annex initremote gcrypt-rsyncd type=gcrypt gitrepo=rsync://***::a/test keyid=*** encryption=hybrid + +initremote gcrypt-rsyncd (encryption setup) (to gpg keys: ***) gcrypt + Decrypting manifest +gpg: Signature made Wed Nov 22 22:23:16 2023 CET +gpg: using EDDSA key *** +gpg: Good signature from "archive-990" [ultimate] +gcrypt: Remote ID is :id:ya5ZivzWNEOUtVg2R0L9 +From gcrypt::rsync://***::a/test + * [new branch] git-annex -> gcrypt-rsyncd/git-annex +gcrypt: Decrypting manifest +gpg: Signature made Wed Nov 22 22:23:16 2023 CET +gpg: using EDDSA key *** +gpg: Good signature from "archive-990" [ultimate] +Everything up-to-date + +git-annex: git: createProcess: chdir: invalid argument (Bad file descriptor) +failed +initremote: 1 failed +``` + +Logs from the daemon show the following error: +``` +rsync to a/test/annex/objects from *** +``` + +I don't know whether this error is imputable to `git-annex`, or `git-remote-gcrypt`, or my settings. diff --git a/doc/git-annex-satisfy.mdwn b/doc/git-annex-satisfy.mdwn index ddbec766ae..e71d6dc674 100644 --- a/doc/git-annex-satisfy.mdwn +++ b/doc/git-annex-satisfy.mdwn @@ -15,6 +15,16 @@ It does the same thing as `git-annex sync --content` without the pulling and pushing of git repositories, and without changing the trees that are imported to or exported from special remotes. +Note that it (like [[git-annex-sync]] or [[git-annex-assist]]) does not work +specifically towards satisfying the [[git-annex-numcopies]] setting and it will +not violate the local preferred content expression in order to move files +between remotes that are not present locally. To allow for files to be present +locally for such a movement between remotes, consider adding `or +approxlackingcopies=1` to your local [[preferred_content]] expression (and +maybe increasing [[git-annex-numcopies]] accordingly) so that files may pass +through your local repo temporarily. Otherwise, `git annex satisfy` does not +see a pathway for files to pass between other remotes. + # OPTIONS * `[remote]`