Re: git patch friendly question

On 17.08.2012 16:48, Yuanhui Zhang wrote:
> Hi, I'm code::blocks developer, I use both tortoiseSVN(latest 1.7.8) and tortoiseGit for the development. The official Code::blocks use the SVN, but I sometimes use Git. When I would like to commit to the official SVN repo, what I would do is:
> 1, create a patch in my git repo using the TortoiseGit.
> 2, apply the patch in the local svn repo.
> 3, commit the svn change to the remote servo.
>
> But I have problems doing the second step. When I have a patch file create from git, I can't not directly apply the file by TortoiseSVN->Context Menu->Apply patch..., the TortoiseSVN always report a failure or did nothing, besides that, TortoiseSVN will create some empty dummy folder named "b" and "b/xxx".
>
> What works for step two is one of the below way:
> 1, I can use the svn command line, like: svn patch test.patch --strip 1
> 2, I can use the "patch utility", like: patch -p1 <test.patch
>
> Both of the above methods, I can directly apply the patch generated from the git without modifying the patch file.
>
> So, my question is: can TortoiseSVN be more git patch friendly? Thanks.
>
> We have a detailed discussion in Code::Blocks forum, see this link: http://forums.codeblocks.org/index.php/topic,16559.msg113716.html#msg113716

Can you please send me:
1) an url where I can check out a test folder
2) a git patch that doesn't work with TMerge for that folder

If I can reproduce the problem I might be able to fix it.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2999165
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].