diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-07 18:47:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-07 18:47:04 -0400 |
| commit | e1fe1cf1069a12e61ddbb20143fcd7e70b5a2f3d (patch) | |
| tree | 2c69559114547f6db2b64e2147d52dcdd18284fb | |
| parent | eb259a74840fc7e4769a3ba3384b635b3b4ef5be (diff) | |
| parent | aa123ace14668bbbcd4dbdd74334d9e191c64c3b (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/bugs/merge_causes_out_of_memory_on_large_repos.mdwn | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/doc/bugs/merge_causes_out_of_memory_on_large_repos.mdwn b/doc/bugs/merge_causes_out_of_memory_on_large_repos.mdwn new file mode 100644 index 000000000..33786171a --- /dev/null +++ b/doc/bugs/merge_causes_out_of_memory_on_large_repos.mdwn @@ -0,0 +1,25 @@ +### Please describe the problem. + +`git annex merge` goes out of memory on a large repo. + + +### What steps will reproduce the problem? + + $ git annex merge + merge git-annex git-annex: out of memory (requested 1048576 bytes) + +### What version of git-annex are you using? On what operating system? + + git-annex version: 4.20130827 + build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS + +On debian wheezy i386 + +### Please provide any additional information below. + +The repository contains a lot of files: + + $ cd .git/objects + $ find . -type f | wc -l + 1091548 + |