{"thread":{"id":"29096","subject":"git svn rebase “out of memory” error after merging two tracking branches","startedAt":"2011-12-06T16:40:41Z","lastAt":"2011-12-06T17:56:52Z","messageCount":2,"participants":["Onsager","Thomas Rast"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"180381","messageId":"4EDE4589.9030601@gmx.net","threadId":"29096","inReplyTo":null,"subject":"git svn rebase “out of memory” error after merging two tracking branches","fromName":"Onsager","fromEmail":"onsager@gmx.net","sentAt":"2011-12-06T16:40:41Z","receivedAt":"2011-12-06T16:40:41Z","isPatch":false,"sender":{"key":"onsager@gmx.net","avatar":null},"body":"@list\n\n... more detailed explanation on stackoverflow:\n\nhttp://stackoverflow.com/questions/8398405/git-svn-rebase-out-of-memory-error-after-merging-two-tracking-branches\n\nIs there something, I can do about this issue as a common user?\n\nMichael\n"},{"id":"180388","messageId":"201112061856.52560.trast@student.ethz.ch","threadId":"29096","inReplyTo":"4EDE4589.9030601@gmx.net","subject":"Re: git svn rebase “out of memory” error after merging two tracking branches","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2011-12-06T17:56:52Z","receivedAt":"2011-12-06T17:56:52Z","isPatch":false,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Onsager wrote:\n> @list\n> \n> ... more detailed explanation on stackoverflow:\n> \n> http://stackoverflow.com/questions/8398405/git-svn-rebase-out-of-memory-error-after-merging-two-tracking-branches\n> \n> Is there something, I can do about this issue as a common user?\n\nIn this age of 5-second attention spans, I'm not sure you can expect\nus to follow a link to an external site when a simple cut&paste job\nwould have sufficed, like so:\n\n  I'm tracking two customer SVN branches with msysgit 1.7.7.1 (Win 7 64bit):\n\n    SVN                Git\n\n    trunk          --> master\n    release_x_y_z  --> git-local-release_x_y_z \n\n  After a successful local merge of 'git-local-release_x_y_z' into\n  'master' I'm running out of memory, when trying to synchronize the\n  result with svn:\n\n    mb@MMPEPA23 /c/git/MySoft (master)\n    $ git svn rebase\n    First, rewinding head to replay your work on top of it...\n    Applying:\n    fatal: Out of memory, realloc failed\n    Repository lacks necessary blobs to fall back on 3-way merge.\n    Cannot fall back to three-way merge.\n    Patch failed at 0001\n\n    When you have resolved this problem run \"git rebase --continue\".\n    If you would prefer to skip this patch, instead run \"git rebase --skip\".\n    To check out the original branch and stop rebasing run \"git rebase --abort\".\n\n    rebase refs/remotes/git-svn: command returned error: 1 \n\n  The .git/rebase-apply directory contains a few files ('patch', '0001')\n  with more than 1GB size. What can I do in order to apply this patch?\n\n\nFirst you should find out whether something went wrong with the patch\ngeneration, or if that 1GB size is plausible.  Did your merge bring in\nblobs that were that big?\n\nSecond, you could try with the -m option.  This will use a 3-way merge\nto rebase, which avoids generating a full patch.\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"}]}