有没有办法找出集市更新会做什么
有没有一种方法可以在不实际执行的情况下找出 bzr 更新将执行哪些更改。 特别是，如果发生冲突，我想得到一些警告。
Is theere a way of finding out what changes a bzr update will do without actually doing it.
Specifially I would like to have a bit of warning if there is going to be a conflict.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
我不直接知道，这就是
bzr revert的用途。但是，有一种常见的方法可以帮助您构建本地分支机构。我使用一个镜像中央分支的本地分支，然后我从该分支中分支出我的工作。当我准备好“签入”时，我会更新我的本地镜像分支，它总是会成功而不会发生冲突，因为我没有更改该分支的工作副本。然后我将我的功能分支合并到我的本地镜像分支中，然后将我的本地镜像分支推送到中央存储库。在您的情况下，此设置的优点是，如果您不想实际尝试合并，可以使用
bzr merge --preview或bzr diff来查看更改。我个人更喜欢恢复合并，直到上游或本地功能分支中的冲突得到解决。Not directly that I'm aware of, that's what
bzr revertis for. However, there is a common way to structure your local branches to help. I use one local branch that mirrors the central branch, then I branch off of that for my work. When I'm ready to "check in," I update my local mirror branch, which always succeeds without conflicts because I haven't changed my working copy of that branch. Then I merge my feature branch into my local mirror branch, then push my local mirror branch to the central repository.The advantage of this setup in your case is you could use
bzr merge --previeworbzr diffto see the changes if you don't want to actually try the merge. I personally prefer just to revert the merge until the conflicts are fixed either upstream or in my local feature branch.