How could we manage to import into a hg repo the differences of two repos.
我们怎么能设法导入hg repo两个回购的差异。
I mean, say we have repo A, A2 and B. I would like to import to repo B(same file structure than A) the differences between A2 and A (A2 is just A with some changes).
我的意思是，说我们有回购A，A2和B.我想导入回购B（与A相同的文件结构）A2和A之间的差异（A2只是A有一些变化）。
I guess we should generate a diff between both directories and use hg import, but how should the diff be generated?
is there a better way to do this?
我想我们应该在两个目录之间生成差异并使用hg import，但是应该如何生成差异？有一个更好的方法吗？
1 个解决方案
#1
1
If B is totally equal to A you can (in B) just pull from A2
如果B完全等于A，你可以（在B中）从A2拉出
If B also differ from A, you can:
如果B也与A不同，您可以：
- pull A from A2 (get additional head in A2 as result)
- 从A2拉A（结果在A2中得到额外的头）
- save diff of heads in A2 into file
- 将A2中的磁头差异保存到文件中
- import result of previous operation into B
- 将上一次操作的结果导入B
And, BTW, you can streamline your current exotic workflow
而且，顺便说一句，您可以简化当前的异国情调工作流程
#1
1
If B is totally equal to A you can (in B) just pull from A2
如果B完全等于A，你可以（在B中）从A2拉出
If B also differ from A, you can:
如果B也与A不同，您可以：
- pull A from A2 (get additional head in A2 as result)
- 从A2拉A（结果在A2中得到额外的头）
- save diff of heads in A2 into file
- 将A2中的磁头差异保存到文件中
- import result of previous operation into B
- 将上一次操作的结果导入B
And, BTW, you can streamline your current exotic workflow
而且，顺便说一句，您可以简化当前的异国情调工作流程