bzr merge - 在提交之前查看另一个分支提交注释（“合并提示”）
我有一个开发人员做了一些更改，并要求我将它们合并。为了安全起见，我没有完全合并/提交他的工作，而是制作了他的分支的副本，以便我可以做'bzr 日志 --forward -n 0 -v | less' 以查看他的提交注释，并了解已修改/添加的文件。
由于他进行了多项更改，我不想一次性将它们全部合并。相反，我想在检查完他的更改后一次将其提交到我的分支。
问题是，我没有看到他的更改的每个“合并提示”的任何修订 ID。
例如，如果他在 r250、251、252 处提交了更改，而我将所有这些更改合并到工作树中，那么如何提交他的 r250？我是否必须一次合并他的一项更改？或者有没有办法通过“合并提示”来做到这一点？
我不确定合并提示有多有用，如果它们只向您显示评论，并且不提供单独合并每个提示的功能。
当然，我可能会遗漏一些常识；如果是这样，请赐教。
预先非常感谢。
I have a developer who has made some changes, and has asked that I merge them in. In order to be safe, I haven't merged/committed his work outright, but instead made a copy of his branch so that I can do a 'bzr log --forward -n 0 -v | less' to see his commit notes, and to understand the files which were modified/added.
Since he has made several changes, I don't want to merge them all in one shot. Instead, I'd like to commit his changes to my branch one at a time after reviewing them.
Problem is, I don't see any revision IDs for each of the "merge tips" for his changes.
If for example, he's committed changes at r250, 251, 252, and I merge all these changes in to the working tree, how can commit his r250? Do I have to merge his changes in one at a time? or is there a way of doing this via the "merge tips"?
I'm not sure how useful merge tips are, if they only show you comments, and don't provide an ability to merge each tip in individually.
Of course I may be missing something which is common knowledge; if so, please enlighten me.
Thanks very much in advance.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
不要反对合并，而是使用它。合并旨在像这样一次拉取多个更改，同时仍然维护单独的底层提交。检查他的分支，并检查他的每一项提交，一次一项。一旦你对它们都感到满意，就可以一次性合并整套。
Instead of working against merge, work with it. Merge is designed to pull multiple changes at once like this, while still maintaining the separate underlying commits. Check out his branch, and review each one of his commits, one at a time. Once you are satisfied with them all, merge the whole set in one go.
我会将其他人的更改合并到我的工作文件夹中，然后
并查看每个更改是什么，然后从
您可以恢复不想包含的文件...并提交其余文件。
不过我对集市还很陌生。 :)
I'd merge someone else's changes into my working folder, then
and see what each change was, then from
you can revert the files you don't want to include... and commit the rest.
I'm fairly new to bazaar though. :)