开发者

TortoiseSvn Merge followed by Create Patch does not include new files

开发者 https://www.devze.com 2022-12-31 23:29 出处：网络

I am doing a Merge in TortoiseSvn, which modifies some files, deletes some, and adds so开发者_开发知识库me.Next I am doing a Create Patch to create a patch file with these changes.The problem is that

相关专题：merge patch svn tortoisesvn

I am doing a Merge in TortoiseSvn, which modifies some files, deletes some, and adds so开发者_开发知识库me. Next I am doing a Create Patch to create a patch file with these changes. The problem is that the resulting patch file includes only the modifications and deletions, not the adds.

I have discovered a workaround. If I revert the adds and then do an explicit Add of those files in TortoiseSVN, then do a Patch, it picks up everything, including the Adds.

Is there a way to avoid this workaround?

It looks like it is a know bug in Subversion and it is not an issue with TortoiseSvn. It doesn't look like it will be fixed in Subversion 1.6.x because they are redoing the patch/diff system in version 1.7. So it appears you will need to continue using your workaround until version 1.7, which will hopefully have this issue fixed.

http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2451115