Hello,
i have some problems with git patches.
I have a SVN Trunk and a GIT Trunk.
Now i want to add svn changes to git.
I do:
git svn clone svnTrunk svnTrunkClone
git log --oneline
git format-patch 1b5b9e7..f58e5d6
patch -p 1 name.patch
(git apply doesnt work)
Errors from git apply:
error:
On Fri, 5 Aug 2011 04:07:32 -0700 (PDT)
Thorsten Peters impyna...@googlemail.com wrote:
i have some problems with git patches.
I have a SVN Trunk and a GIT Trunk.
Now i want to add svn changes to git.
I do:
git svn clone svnTrunk svnTrunkClone
git log --oneline
git format-patch
Ok, it seems that i have forgotten one rev, so patch -p1 test.patch
work for the the first rev now.
If i try git am i got the message:
error: appc/dbc/functions.inc.php: does not exist in index
error: tests/bootstrap.php: does not exist in index
What is better? git am or patch ?
On 5 Aug.,