如何“变基"Subversion 中的分支(没有任何真正的提交)(对存储库的访问受限)? [英] How to "rebase" branch (without any real commits) in Subversion (limited access to repository)?

查看:50
本文介绍了如何“变基"Subversion 中的分支(没有任何真正的提交)(对存储库的访问受限)?的处理方法,对大家解决问题具有一定的参考价值,需要的朋友们下面随着小编来一起学习吧!

问题描述

我对 Subversion 存储库中只有一个分支具有提交访问权限(写入权限).

I have commit access (write permission) to only one branch in Subversion repository.

不幸的是,前段时间说分支是从主干中创建的;我想在当前主干(当前 HEAD)的顶部重新定位"它.所述分支上没有真正的"提交,只有

Unfortunately said branch was created out of trunk some time ago; I'd like to "rebase" it on top of current trunk (current HEAD). There are no 'real' commits on said branch, only

基于主干 rev2921 创建 foo 分支

created foo branch based on trunk rev2921

注意:我对上述分支外的任何地方都没有写权限.

Note: I don't have write permissions to anywhere outside said branch.

推荐答案

如果分支中没有提交,请 SVN 管理员删除并新建一个;这样你就可以免除自己的痛苦.或者,您可以合并主干中的所有更改;大多数情况下都可以正常工作,但某些目录操作可能会相互冲突,即使您正在执行相当于快进合并的 SVN,在这种情况下,您将有很多手动清理工作要做.

If there are no commits in the branch, ask the SVN admin to delete it and create a new one; you might spare yourself some pain that way. Alternatively, you can merge all changes from trunk; most of the time that works fine, but certain directory operations can conflict with each other even when you are doing the SVN equivalent of a fast-forward merge, in which case you will have a lot of manual cleanup to do.

这篇关于如何“变基"Subversion 中的分支(没有任何真正的提交)(对存储库的访问受限)?的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!

查看全文
登录 关闭
扫码关注1秒登录
发送“验证码”获取 | 15天全站免登陆