Bazaar Eclipse 或外部合并/冲突工具
有没有什么好的工具可以合并/解决 Bazaar + Eclipse 的冲突?
我希望 Bazaar 能够像 Subversion 一样与 Eclipse 集成。
Are there any good tools for merging/resolving conflicts for Bazaar + Eclipse?
I wish Bazaar was integrated with Eclipse the same way Subversion is.
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(2)
你见过 Bzr-Eclipse 和 QBzr-Eclipse?我认为这是一个非此即彼的选择:不要同时安装两者。 Bzr-Eclipse 使用它自己的界面,因此它看起来更接近 Eclipse 的处理方式。 QBzr-Eclipse 链接到 QBzr 的对话框,因此它看起来像 Bazaar Explorer 并且可能维护得更好(此链接)。我更喜欢 QBzr-Eclipse,但这取决于您:尝试一下它们,看看效果如何。
此处有一些 Bzr Eclipse 屏幕截图。
Have you seen Bzr-Eclipse and QBzr-Eclipse? I think it's an either-or choice: don't install both. Bzr-Eclipse uses it's own interface, so it looks closer to the Eclipse way of doing things. QBzr-Eclipse links in to QBzr's dialog boxes, so it looks like Bazaar Explorer and is probably better maintained (this link). I prefer QBzr-Eclipse, but it's up to you: try them both and see how you get on.
There are some Bzr Eclipse screenshots here.
安装&配置
根访问权限。
sudo su
安装meld:
apt-get install meld
转到“/usr/lib/python2.7/dist-packages/bzrlib/plugins” :
cd /usr/lib/python2.7/dist-packages/bzrlib/plugins
下载ExtMerge Bazaar 插件:
bzr 分支 lp:bzr-extmerge extmerge
创建合并脚本:“/usr/bin/meld-助手”:
vim /usr/bin/meld-helper
为合并脚本编写内容:< /p>
#!/bin/bash
mv $1 $1.bak
MV $3 $1
混合 $2 $4 $1
MV $1 $3
mv $1.bak $1
exit 0
从 root 用户退出.
exit
转到 Bazaar 主路径:“~/.bazaar/”。
cd ~/.bazaar/
进行配置备份。
cp bazaar.conf bazaar.conf.bak
编辑 Bazaar 配置文件。
vim bazaar.conf
在末尾添加以下行(在“[ALIASES]”行之前,先检查是否存在,然后更改它):
external_merge = 'meld-helper %r %b %t %o'
完成!
使用
“结帐”
提交更改:
bzr commit -m“提交描述”
更新项目:
bzr update
合并冲突:
bzr extmerge test-file.txt
标记为已解决:
bzr 解析 test-file.txt
提交更改:
bzr commit -m "提交描述"
完成!
使用“分支”
提交更改:
bzr commit -m“提交描述”
获取更改:
bzr pull
合并更改:
bzr 合并
合并冲突:
bzr extmerge test-file.txt
标记为已解决:
bzr 解析 test-file.txt
提交更改:
bzr commit -m“提交描述”
发送更改:
bzr Push
完成!
注意
在“meld”中,您有 3 列:
test.txt .BASE :是文件的第一个版本,在上次“更新”或“拉取”中.
test.txt .OTHER:服务器中文件的新版本。
test.txt:是您的本地版本。在此文件中,我将更改保存到“commit”。
当你关闭“ meld ”时,你的合并文件是“test.txt”!检查是否一切正常!
Install & Configure
Root access.
sudo su
Install meld:
apt-get install meld
Go to "/usr/lib/python2.7/dist-packages/bzrlib/plugins":
cd /usr/lib/python2.7/dist-packages/bzrlib/plugins
Download ExtMerge Bazaar Plugin:
bzr branch lp:bzr-extmerge extmerge
Create merge script: "/usr/bin/meld-helper":
vim /usr/bin/meld-helper
Write content for merge script:
#!/bin/bash
mv $1 $1.bak
mv $3 $1
meld $2 $4 $1
mv $1 $3
mv $1.bak $1
exit 0
Exit from root user.
exit
Go to Bazaar home path: "~/.bazaar/".
cd ~/.bazaar/
Make configuration backup.
cp bazaar.conf bazaar.conf.bak
Edit Bazaar configuration file.
vim bazaar.conf
Add follow line at the end (before "[ALIASES]" line, check if exists first, and change it):
external_merge = 'meld-helper %r %b %t %o'
Finish!
Usage
Using "checkout"
Commit changes:
bzr commit -m "COMMIT DESCRIPTION"
Update project:
bzr update
Merge conflicts:
bzr extmerge test-file.txt
Mark as resolved:
bzr resolve test-file.txt
Commit changes:
bzr commit -m "COMMIT DESCRIPTION"
Finish!
Using "branch"
Commit changes:
bzr commit -m "COMMIT DESCRIPTION"
Get changes:
bzr pull
Merge changes:
bzr merge
Merge conflicts:
bzr extmerge test-file.txt
Mark as resolved:
bzr resolve test-file.txt
Commit changes:
bzr commit -m "COMMIT DESCRIPTION"
Send changes:
bzr push
Finish!
Notes
In "meld", you have 3 columns:
test.txt .BASE : Is the first version of file, in last "update" or "pull".
test.txt .OTHER : Is new version of file in the server.
test.txt : Is your local version. In this file is where I save the changes to "commit".
Your merged file is "test.txt", when you close " meld "! Check if all is ok!