有没有 svn_load_dirs.pl 的替代品? [英] Are there any alternatives to svn_load_dirs.pl?

问题描述

我们有一个很大的供应商分支(1200 个奇怪的文件)最近经历了一些重要的更改，我想将其重新集成到主干中.它更新得相当频繁，我们也需要同样频繁地更新，所以手动更新会浪费太多时间.

We have a large vendor branch (1200 odd files) that has recently undergone some non-trivial changes, which I'd like to integrate back into the trunk. It updates fairly frequently and we'll need to update equally frequently, so doing it by hand is going to involve far too much wasted time.

这就是 svn_load_dirs.pl 的目的，只是我没有 perl 解释器，并且根据过去的经验，通过官僚机构的层级来安装一个解释器会比通过每次都用手.

This is what svn_load_dirs.pl was made for, only I've no perl interpreter and going through the the layers of bureaucracy to get one installed would, based on past experience, take longer and involve more pain than doing the merge by hand each time.

我们确实有一个 Python 解释器，svn_load 可以很好地完成这项工作.它只是直接使用未安装的 pysvn，而不是使用 SVN CLI.见上图:不要过关，不要收 200 英镑.

We do have a python interpreter, and svn_load would do the job nicely. Only rather than using the SVN CLI it uses pysvn directly, which isn't installed. See above: do not pass go, do not collect £200.

我意识到这不太可能，但有人知道其他选择吗?

I realise it's unlikely, but anyone know of any other alternatives?

推荐答案

您可以将新版本导入到不同的目录，然后使用 --ignore-ancestry 进行 3-URL-merge.

You can import the new version to a different directory and then do a 3-URL-merge with --ignore-ancestry.

更详细的解释:

您的供应商分支的旧版本位于

your old version of your vendor branch resides in

/vendor_0.1.1

您将新版本导入到:

/vendor_0.1.2

然后您可以将它们合并到指向您的工作版本的工作副本:

you can then merge them to your working copy which is pointing to your working version:

svn merge --ignore-ancestry <URL>/vendor_0.1.1 <URL>/vendor_0.1.2 <PATH_TO_WC>

通过这样做，您将比较两个版本并将差异应用于您的工作副本.

By doing this, you will compare both versions and apply the difference to your working copy.

注意:

由于您总是导入供应商分支的完整版本，您的存储库会增长得更快

As you always import the full version of your vendor branch, Your repository will grow faster

这篇关于有没有 svn_load_dirs.pl 的替代品?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！