svn-mergeinfo

Tortoisesvn skips recording mergeinfo

让人想犯罪 __ 提交于 2019-11-30 17:54:36
I have checked out the trunk from one of our svn repos. I then right click -> merge -> merge some revisions -> merge from branch A -> choose one revision and then finally apply the merge. My TortoiseSVN updates the files, and updates the mergeinfo. When I commit these changes to trunk, tortoisesvn shows me the files to commit, and also the /trunk folder which is affected because the svn:mergeinfo has been updated. My colleague has the exact same tortoisesvn installed, and does exactly the same thing. We have the exact same global ignore pattern. When he does the merge procedure, the svn

Tortoisesvn skips recording mergeinfo

我的未来我决定 提交于 2019-11-30 00:55:25
问题 I have checked out the trunk from one of our svn repos. I then right click -> merge -> merge some revisions -> merge from branch A -> choose one revision and then finally apply the merge. My TortoiseSVN updates the files, and updates the mergeinfo. When I commit these changes to trunk, tortoisesvn shows me the files to commit, and also the /trunk folder which is affected because the svn:mergeinfo has been updated. My colleague has the exact same tortoisesvn installed, and does exactly the

Remove unnecessary svn:mergeinfo properties

一笑奈何 提交于 2019-11-27 02:35:19
When I merge stuff in my repository Subversion wants to add/change a lot of svn:mergeinfo properties to files that are totally unrelated to the things that I want to merge. Questions about this behaviour have been asked before here on Stack Overflow: SVN Mergeinfo properties on paths other than the working copy root Is there a way to turn TortoiseSVN using svn:mergeinfo off? From what I understand from the topics mentioned above it looks like a lot of files in my repository have explicit svn:mergeinfo properties on them, when they shouldn't. The advice is to reduce the amount and only put

Remove unnecessary svn:mergeinfo properties

半腔热情 提交于 2019-11-26 22:14:28
问题 When I merge stuff in my repository Subversion wants to add/change a lot of svn:mergeinfo properties to files that are totally unrelated to the things that I want to merge. Questions about this behaviour have been asked before here on Stack Overflow: SVN Mergeinfo properties on paths other than the working copy root Is there a way to turn TortoiseSVN using svn:mergeinfo off? From what I understand from the topics mentioned above it looks like a lot of files in my repository have explicit svn