svnmerge 并重命名分支中断跟踪?

发布于 2024-07-27 04:42:00 字数 90 浏览 9 评论 0原文

如果我使用 svnmerge 来跟踪分支的更改,并且我想重命名该分支(通过执行 svn mv ),这会导致分支的方式出现任何问题吗?更改被跟踪? 这是安全的做法吗?

If I'm using svnmerge to track changes for a branch and I want to rename the branch (by doing an svn mv), will this cause any problems with the way the changes are tracked? Is this a safe thing to do?

如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。

扫码二维码加入Web技术交流群

发布评论

需要 登录 才能够评论, 你可以免费 注册 一个本站的账号。

评论(2

橙味迷妹 2024-08-03 04:42:00

西迪厄斯。 是的,这会导致跟踪更改的方式出现问题。 然而,只要您更新跟踪您移动的分支的任何分支,这是一件安全的事情。

这很简单,如下所示:

cd /path/to/tracking/branch
svn pe svnmerge-integrated .

您将看到类似于以下内容的一行(如果要跟踪多行,则为一行):

/trunk:1-8334,8336-8440,8444-8450,8452-8458,8460-8469,8471-8476,8480,8486

这表明我的这个分支正在跟踪我的存储库的 /trunk,以及具有以下内容的修订列表:被合并到其中。 您只需将 /trunk 更改为 /mynewbranch 并保存文件即可。

您还需要对 svnmerge-blocked 属性执行相同的操作,如下所示:

svn pe svnmerge-blocked .

如果此文件为空,则忽略它。

Sydius. Yes this will cause problems with the way changes are tracked. However it is a safe thing to do, as long as you update any branches tracking the branch you moved.

This is as simple as the following:

cd /path/to/tracking/branch
svn pe svnmerge-integrated .

You will see a line (or lines if you are tracking multiple) similar to the following:

/trunk:1-8334,8336-8440,8444-8450,8452-8458,8460-8469,8471-8476,8480,8486

This designates that this branch of mine is tracking the /trunk of my repository, and the list of revisions that have been merged into it. You can simply change /trunk to be /mynewbranch and save the file.

You will also need to do the same for the svnmerge-blocked property, as such:

svn pe svnmerge-blocked .

If this file is empty, then just ignore it.

诗笺 2024-08-03 04:42:00

评论好像被关闭了,但是答案有问题。 如果您等到移动分支后才运行 svnmerge.py init ,则“init”根本拒绝运行,因为
它以某种方式拉出旧路径并尝试使用它,但没有成功。

Comments seem to be closed, but there's a problem with the answer. If you wait to run svnmerge.py init until after moving the branch, the 'init' refuses to run at all, since
it somehow pulls the old path out and tries to use it, unsuccessfully.

~没有更多了~
我们使用 Cookies 和其他技术来定制您的体验包括您的登录状态等。通过阅读我们的 隐私政策 了解更多相关信息。 单击 接受 或继续使用网站,即表示您同意使用 Cookies 和您的相关数据。
原文