使用 Beanstalk SVN 分支进行部署

发布于 2024-12-09 04:10:49 字数 249 浏览 8 评论 0原文

Beanstalk 建议(在 SVN 中)设置分支作为部署的侦听器(即 /branches/development/)。

如果我当前在该分支中工作,我知道如何将更改合并到该分支。

问题是,是否可以将更改从主干或另一个分支推送到部署分支,而实际上并不在部署分支中工作。

基本上,我在功能分支的主干中工作,并且希望能够输入快速命令以将最新的更改集从工作副本推送到部署分支。我可以这样做吗?如果是这样,你能举个例子吗?

富有的

Beanstalk suggests having branches set up (in SVN) to act as listeners for deployment, (i.e. /branches/development/).

I know how to merge changes to a branch, if I'm currently working in that branch.

The question is, is it possible to push changes from the trunk or another branch to the deployment branch, while not actually working in the deployment branch.

Basically, I work either in the trunk of a feature branch and I want to be able to type in a quick command to push the latest set of changes from my working copy to the deployment branch. Can I do this? If so, can you provide an example?

Rich

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

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

发布评论

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

评论(2

浊酒尽余欢 2024-12-16 04:10:49

普通的独立 svn 无法直接合并到存储库,您需要将更改合并到工作副本。可以这样想,在完成合并之前,您需要一些地方来解决所有冲突。

There is no way with normal standalone svn to do a merge directly to the repository, you need to merge your changes to a working copy. Think of it like this, you needs some where to resolve all conflicts before finalizing the merge.

∞琼窗梦回ˉ 2024-12-16 04:10:49

要将更改从主干(或另一个分支)推送到部署分支,您需要将修改合并到此部署分支。

或者,您可以修改部署分支以使用外部并指向您的功能分支。因此,当您更新此分支时,外部将完成指向最新版本的工作。
这样,您就不必修改部署分支。
http://svnbook.red-bean.com/en/1.5 /svn.advanced.externals.html

第三种解决方案:您可以根据您用bazaar推送到SVN的方式,直接将您的修改从feature分支推送到用bazaar的主干存储库(Bazaar 有一个 svn 插件)。
http://doc.bazaar.canonical.com/beta/en /user-guide/svn_plugin.html

我希望这会有所帮助,至少在开始时。

To push the changes from the trunk (or another branch) to the deployment branch, you need to merge your modification to this deployment branch.

or, you can modify your deployment branch to use external and point to your feature branch. So when you update this branch, the external will do the job to point to the latest version.
This way, you don't have to modify the deployment branch.
http://svnbook.red-bean.com/en/1.5/svn.advanced.externals.html

A third solution : you may be able to push directly your modification from the feature branch to the trunk with bazaar according that you push with bazaar to SVN repository (Bazaar has a svn plugin).
http://doc.bazaar.canonical.com/beta/en/user-guide/svn_plugin.html

I hope this will help, at least to start.

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