有没有办法告诉 svn merge 何时使用重新集成选项?
Subversion 1.6 中是否有一种方法,使用日志、mergeinfo 等来确定何时使用 --reintegrate 选项完成合并? (这假设人们知道哪些提交是合并的结果。)
Is there a way in Subversion 1.6, using logs, mergeinfo, etc., to determine when a merge was done with the --reintegrate option? (This presumes one knows which commits are the results of merges.)
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
存储的唯一信息是合并的修订列表。 如何合并它们没有被记录。
不过,您可以通过检查文件内容做出很好的猜测:重新集成合并后,合并源和合并目标之间的唯一区别将是合并目标的那些先前未合并到合并源的修订。
The only information stored is the list of revisions that were merged. How they were merged is not recorded.
You can make a good guess by examining the file contents, though: After a reintegrate merge, the only difference between merge source and merge destination will be those revisions of the merge destination that were not previously merged to the merge source.