blocks|key|3117990|text|正如在this+thread中提到的|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|3117991|3117992|大多数空合并信息(“空白”)可能是由工作副本到工作副本副本/移动造成的，其中源项目没有明确的合并信息。除非您使用的是1.6SVN，否则可以使用directory|unordered-list-item|3117993|there作为解决方案:由于1.5.5版本的这些WC-to-WC拷贝不再在目标|3117994|上创建空的合并信息，因此早期的svn移动(重命名)重组操作也可以传播合并信息，而不是将它们留在根目录svn是一个潜在的内存问题，case+3393会跟踪该问题，该问题将在即将发布的1.6.2版本中修复，并在1.5|3117995|中反向移植|3117996|entityMap|0|LINK|mutability|MUTABLE|url|http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1601195|1|http://subversion.tigris.org/issues/show_bug.cgi?id=3393^0|3|B|0|0|0|0|0|1S|9|1|0|0^^$0|@$1|2|3|4|5|6|7|X|8|@]|9|@$A|Y|B|Z|1|10]]|C|$]]|$1|D|3|-4|5|6|7|11|8|@]|9|@]|C|$]]|$1|E|3|F|5|G|7|12|8|@]|9|@]|C|$]]|$1|H|3|I|5|G|7|13|8|@]|9|@]|C|$]]|$1|J|3|K|5|G|7|14|8|@]|9|@$A|15|B|16|1|17]]|C|$]]|$1|L|3|M|5|6|7|18|8|@]|9|@]|C|$]]|$1|N|3|-4|5|6|7|19|8|@]|9|@]|C|$]]]|O|$P|$5|Q|R|S|C|$T|U]]|V|$5|Q|R|S|C|$T|W]]]]

As mentioned in <a href="http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&amp;dsMessageId=1601195" rel="nofollow noreferrer">this thread</a>:

<ul>
<li>Most empty mergeinfo ("blank") can be caused by working copy to working copy copies/moves where the source item has no explicit mergeinfo. Using propdel can be the solution unless you are using a 1.6 SVN: since 1.5.5 these WC-to-WC copies no longer create empty mergeinfo on the destination</li>
<li>an earlier svn move (rename) restructuring operation can also propagate mergeinfo, instead of leaving them at the root directory</li>
<li>there is a potential memory issue, tracked by <a href="http://subversion.tigris.org/issues/show_bug.cgi?id=3393" rel="nofollow noreferrer">case 3393</a> which will be fixed in an upcoming 1.6.2 version and back-ported in 1.5</li>
</ul>

blocks|key|344107|text|如果您确定要批量删除mergeinfo属性，可以使用以下BASH脚本。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|344108|FILES=`svn+status+%7Cgrep+"%5E+M++++++"+%7Csed+s/"+M++++++"//+%7Ctr+'\n',+'+'`
svn+revert+$FILES|code-block|syntax|javascript|344109|它获取一个已更改文件的列表，将其过滤为仅合并信息仅更改，剥离除实际文件路径之外的所有内容，将每行一条路径转换为空格分隔的列表，然后在该列表上恢复调用。|344110|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

If you're sure you want to mass-remove mergeinfo properties, you can use the following BASH script.

<pre><code>FILES=`svn status |grep "^ M " |sed s/" M "// |tr '\n', ' '`
svn revert $FILES
</code></pre>

It gets a list of changed files, filters it to just mergeinfo only changes, strips everything but the actual file path, converts the one-per-line paths into a space delimited list, and the calls revert on that list.

blocks|key|3330829|text|下面是删除所有子树svn:mergeinfo属性的方法。在存储库的根目录中运行它：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3330830|svn+propget+svn:mergeinfo+--depth=infinity+
++++%7C+grep+-v+"%5E/"
++++%7C+grep+-v+"%5E\."+++
++++%7C+cut+-d-+-f1+
++++%7C+xargs+svn+propdel+svn:mergeinfo|code-block|syntax|javascript|3330831|所有内容都在一行中，便于复制/粘贴：|3330832|svn+propget+svn:mergeinfo+--depth=infinity+%7C+grep+-v+"%5E/"+%7C+grep+-v+"%5E\."+%7C+cut+-d-+-f1+%7C+xargs+svn+propdel+svn:mergeinfo|3330833|要在运行之前预览将影响的文件，请将最后一个"propdel“更改为"propget”，或者完全删除最后一个xargs管道。|3330834|entityMap^0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Q|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|R|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|S|8|@]|9|@]|A|$]]|$1|M|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|N|$]]

Here is a way to delete all subtree svn:mergeinfo properties. Run it inside the root of your repository:

<pre><code>svn propget svn:mergeinfo --depth=infinity 
 | grep -v "^/"
 | grep -v "^\." 
 | cut -d- -f1 
 | xargs svn propdel svn:mergeinfo
</code></pre>

All in one line for easy copy/pasting:

<pre><code>svn propget svn:mergeinfo --depth=infinity | grep -v "^/" | grep -v "^\." | cut -d- -f1 | xargs svn propdel svn:mergeinfo
</code></pre>

To preview which files this will effect before you run it, change the last "propdel" to "propget" or remove the last xargs pipe altogether.

blocks|key|3330922|text|我知道已经有一段时间了，但我遇到了类似的问题。我使用的是TortoiseSVN+1.6.7。碰巧这个属性位于我的工作副本的根目录上。当我查看根目录上的属性并单击svn:mergeinfo上的Remove时，它会问我是否要递归删除它。这消除了我所有的svn:mergeinfo乱码。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3330923|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

I know it's been a while, but I ran into a similar problem. I'm using TortoiseSVN 1.6.7. It just so happened that the property was on the root of my working copy. When I viewed the properties on the root and clicked Remove on svn:mergeinfo, it asked me if I want to remove it recursively. This got rid of all of my svn:mergeinfo cockups.

blocks|key|342729|text|这是另一种删除所有子树svn的方法:mergeinfo属性，但不在根文件夹(这是分支正常工作所必需的)。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|342730|从项目的根目录执行以下操作：|342731|svn+propdel+svn:mergeinfo+-R
svn+revert+.
svn+ci+-m+"Removed+mergeinfo"|code-block|syntax|javascript|342732|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|L|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|M|8|@]|9|@]|A|$G|H]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

Here is another way to delete all sub tree svn:mergeinfo properties but not at the root folder (this is needed for branching to work properly).

From the root of the project do:

<pre><code>svn propdel svn:mergeinfo -R
svn revert .
svn ci -m "Removed mergeinfo"
</code></pre>

blocks|key|345138|text|要在目录结构中进行更改，这将是(仅限非DOS+'find‘)：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|345139|find+.+-path+"*/.svn"+-prune+-or+-exec+svn+propdel+svn:mergeinfo+'{}'+\;|code-block|syntax|javascript|345140|运行连接到1.5服务器的1.6.12客户机时，我遇到了类似的问题；项目中有一个子目录需要自己的svn:mergeinfo，但是有121个这样的条目(包括下面的5个目录"svn:ignore+*")似乎有点不合适。因此，如果有一个(例如Python)脚本能够删除明显多余的合并信息并告诉其他差异，那就太好了……|345141|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

To do changes in a directory structure, this would be (non-DOS 'find' only):

<pre><code>find . -path "*/.svn" -prune -or -exec svn propdel svn:mergeinfo '{}' \;
</code></pre>

Running an 1.6.12 client connected to an 1.5 server, I have a similar problem; there is a subdirectory in the project which needs its own svn:mergeinfo, but having 121 such entries (including 5 directories below ./var with "svn:ignore *") seems somewhat inappropriate. Thus, it would be nice to have a (e.g. Python) script which is able to remove the obviously superfluous merge info and tell about other differences ...

blocks|key|3118397|text|由于我对盲目删除svn:merge-info属性没有信心，我已经实现了一个工具来分析工作副本上的当前情况，并从非根合并信息属性中删除尽可能多的合并修订。在额外的人工检查和控制之后，可以提交工作副本上的更改。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|3118398|这就是：svn-clean-mergeinfo|3118399|请毫不犹豫地报告有关其使用情况的任何问题，以使其得到改进。|3118400|Subversion+1.10引入了一个专门用于该任务的新工具：svn-mergeinfo-normalizer|3118401|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/ymartin59/svn-clean-mergeinfo^0|8|E|0|4|J|0|0|0|W|O|0^^$0|@$1|2|3|4|5|6|7|T|8|@$9|U|A|V|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|W|8|@]|D|@$9|X|A|Y|1|Z]]|E|$]]|$1|H|3|I|5|6|7|10|8|@]|D|@]|E|$]]|$1|J|3|K|5|6|7|11|8|@$9|12|A|13|B|C]]|D|@]|E|$]]|$1|L|3|-4|5|6|7|14|8|@]|D|@]|E|$]]]|M|$N|$5|O|P|Q|E|$R|S]]]]

As I am not confident with blind <code>svn:merge-info</code> property deletion, I have implemented a tool to analyze the current situation on a working copy and remove as much merge revisions as possible from non-root merge-info properties. After additional human checks and controls, the changes on the working copy can be committed.

Here it is: <a href="https://github.com/ymartin59/svn-clean-mergeinfo" rel="nofollow noreferrer">svn-clean-mergeinfo</a>

Do not hesitate to report any issue about its usage to get it improved.

Subversion 1.10 introduces a new tool dedicated to that task: <code>svn-mergeinfo-normalizer</code>

blocks|key|347823|text|除了盲目地删除mergeinfo属性之外，还可以完成“缺失”的合并。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|347824|从根文件夹复制mergeinfo属性，然后对子文件夹执行合并，以获得适当的相对路径和完全相同的修订列表。(您可以(但不需要)仅列出此列表与子文件夹中已有列表之间的差异。)|347825|通常情况下，合并应该只更改mergeinfo属性，而不是任何实际的文件。(如果它最终更改了文件，那么之前的某个合并肯定只是部分合并，这可能会给您带来问题。)|347826|这样做的最终结果应该是删除mergeinfo属性，一旦你让它们完全匹配。您可能还需要反其道而行之:将仅存在于子文件夹中的所有合并修订合并到根目录中(同样，您可以粘贴完整的列表，让SVN为您查找差异)。|347827|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|J|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|K|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|L|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|M|8|@]|9|@]|A|$]]|$1|H|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|I|$]]

Rather than just blindly deleting the mergeinfo properties, it's also possible to complete the "missing" merges.

Copy the mergeinfo property from the root folder, and then perform a merge on the child folder for the appropriate relative path and the exact same revision list. (You can, but do not need to, only list the differences between this list and the one already on the child folder.)

Normally this merge should end up only changing the mergeinfo properties, not any actual files. (If it does end up changing files, then one of the previous merges must have only been a partial merge, which may have been causing you problems anyway.)

Doing this should end up deleting the mergeinfo property for you, once you've gotten them both to match exactly. You may also need to do the reverse: merge into the root any merge revisions only present on the child folder (again, you can just paste the full list and let SVN sort out finding the differences for you).

When I merge stuff in my repository Subversion wants to add/change a lot of <code>svn:mergeinfo</code> 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:

<ul>
<li><a href="https://stackoverflow.com/questions/391864/svn-mergeinfo-properties-on-paths-other-than-the-working-copy-root">SVN Mergeinfo properties on paths other than the working copy root</a></li>
<li><a href="https://stackoverflow.com/questions/622409/tortoisesvn-using-svnmergeinfo-is-there-a-way-to-turn-it-off">Is there a way to turn TortoiseSVN using svn:mergeinfo off?</a></li>
</ul>

From what I understand from the topics mentioned above it looks like a lot of files in my repository have explicit <code>svn:mergeinfo</code> properties on them, when they shouldn't. The advice is to reduce the amount and only put those properties on relevant files/folders.

So now my question: how can I easily remove those unneeded properties? I'm using TortoiseSVN, but I am reluctant to manually check/fix hundreds of files. Is there an easier way to remove those unnecessary <code>svn:mergeinfo</code> properties?

P.S. I'm not looking for C++ SVN API code.

Remove unnecessary svn:mergeinfo properties

服务器

Python

当我合并存储库中的内容时，Subversion想要添加/更改许多svn:mergeinfo属性到与我想要合并的内容完全无关的文件。关于这种行为的问题之前已经在Stack Overflow上被问过了：根据我从上面提到的主题所理解的，我的存储库中似乎有很多文件都有明确的svn:mergeinfo属性，而实际上他们不应该这样...

问删除不必要的svn:mergeinfo属性
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问删除不必要的svn:mergeinfo属性EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问删除不必要的svn:mergeinfo属性
EN