在Subversion合并期间如何忽略文件夹 [英] How to ignore folder during subversion merge

问题描述

我有很多更改需要合并到分支中，但是在合并过程中我想忽略特定的文件夹.是否可以使用Subversion做到这一点?如果是这样，那我该怎么办?

I have a whole bunch of changes that I need to be merged in to my branch but I want to ignore a specific folder during the merge. Is it possible to do this using Subversion? If so then how can I do it?

我要忽略的文件夹在存储库中，但是在合并过程中我不会对此文件夹进行任何更改

The folder that I want to ignore is in the repository but I don't changes to be made to this folder during the merge

推荐答案

您可以像往常一样进行合并，然后在您不想在提交之前进行任何更改的文件夹上进行递归还原(svn revert -R somefolder).

You could do the merge as normal, then do a recursive revert (svn revert -R somefolder) on the folder where you don't want any changes before committing.

请记住，这将在mergeinfo中引入错误. Subversion会认为某些更改已合并到某个文件夹"中，而实际上却没有.如果您以后想合并这些更改，将会引起一些有趣的问题.

Keep in mind that this will introduce inaccuracies in the mergeinfo though. Subversion will think certain changes were merged to "somefolder" while in reality they were not. That will cause some interesting problems if you do want to merge those changes later on.

编辑:请注意，还原某文件夹将隐式删除该文件夹中所有未决的冲突.这些冲突不会引起痛苦".

edit: note that doing a revert of somefolder will implicitly remove any pending conflicts in that folder. There's no "suffering" induced by these conflicts.

这篇关于在Subversion合并期间如何忽略文件夹的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！