From 8c2629cfd184cd65dc825790844816c92c685c70 Mon Sep 17 00:00:00 2001 From: "georg.schnabel@bd6be2144f897f5caa0028e0dd1e0a65634add81" Date: Wed, 17 Feb 2021 13:58:00 +0000 Subject: [PATCH 1/2] --- doc/git-annex-import.mdwn | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/git-annex-import.mdwn b/doc/git-annex-import.mdwn index afe37a7690..f36bf0be5a 100644 --- a/doc/git-annex-import.mdwn +++ b/doc/git-annex-import.mdwn @@ -105,15 +105,17 @@ the tree of files on the remote, even when importing into a subdirectory. # IMPORTING FROM A DIRECTORY -When run with a path, `git annex import` moves files from somewhere outside -the git working copy, and adds them to the annex. +When run with a path, `git annex import` **moves** files from somewhere outside +the git working copy, and adds them to the annex. In contrast to importing +from a special directory remote, imported files are **deleted from the given path**. This is a legacy interface. It is still supported, but please consider switching to importing from a directory special remote instead, using the interface documented above. Individual files to import can be specified. If a directory is specified, -the entire directory is imported. +the entire directory is imported. Please note that the following instruction +will **delete all files from the source directory**. git annex import /media/camera/DCIM/* From 1845c4e1e32789ba010ad25732cccbec208f8af4 Mon Sep 17 00:00:00 2001 From: "georg.schnabel@bd6be2144f897f5caa0028e0dd1e0a65634add81" Date: Wed, 17 Feb 2021 14:29:53 +0000 Subject: [PATCH 2/2] Added a comment: import from special directory remote fails due to running out of memory --- ...omment_1_8961635a772b4ddb5ba1e04a50034e6a._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/git-annex-import/comment_1_8961635a772b4ddb5ba1e04a50034e6a._comment diff --git a/doc/git-annex-import/comment_1_8961635a772b4ddb5ba1e04a50034e6a._comment b/doc/git-annex-import/comment_1_8961635a772b4ddb5ba1e04a50034e6a._comment new file mode 100644 index 0000000000..4dbdc45cd3 --- /dev/null +++ b/doc/git-annex-import/comment_1_8961635a772b4ddb5ba1e04a50034e6a._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="georg.schnabel@bd6be2144f897f5caa0028e0dd1e0a65634add81" + nickname="georg.schnabel" + avatar="http://cdn.libravatar.org/avatar/b58e4e0101a95b57d55da575ca21f510" + subject="import from special directory remote fails due to running out of memory " + date="2021-02-17T14:29:49Z" + content=""" +First of all, git annex is an awesome tool, I like it very much! + +When trying to `git annex import` from a special directory remote with a large number of files (~4 millions) with a cumulative size of about 1TB, git annex takes up all main memory during the final update remote/ref step on a machine with 16G of main memory and is then killed by the system. This also happens when supplying the `--no-content` option. Is there a way to make git annex less memory demanding when importing from a special directory remote with a large number of files? +"""]]