Hi,
Here is a break down of a problem I currently face: I create a patch
from the last two commits, reset to two versions before and apply the
patch. I tried to do the same on a new git repository and it does work
with the same sequence of commands. But on my submodule I get the
following error:
$ git format-patch -2 --stdout >p
$ git reset --hard HEAD^^
HEAD is now at 8cf5aef Renamed README to show in restructured text
format
$ cat p|git am -3
multiline commit message
Using index info to reconstruct a base tree...
<stdin>:66: trailing whitespace.
"""":param store: the store whose access should be cached
<stdin>:69: trailing whitespace.
:param max_disk_size: limit of overall cache size in bytes
which is kept within by best effort"""
<stdin>:95: trailing whitespace.
<stdin>:110: trailing whitespace.
<stdin>:118: trailing whitespace.
error: patch failed: cloudfusion/cloudfusion/tests/store_test.py:11
error: cloudfusion/cloudfusion/tests/store_test.py: patch does not
apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001 multiline commit message 2
When you have resolved this problem run "git am -3 --resolved".
If you would prefer to skip this patch, instead run "git am -3 --
skip".
To restore the original branch and stop patching run "git am -3 --
abort".
If I omit information it is for brefity and readability. The patch is
pretty long, but if you think it is important I will post it. Can you
tell me why the patch cannot be applied?
Thanks,
Johannes
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/git-users?hl=en.
