我加入了一个绿地编码小组。 当我加入时,他们没有一个共同的存放处,他们把他最近的一篮子送给我。 (eah,我知道......) 我早就在这场摇篮中工作,进行变革,增加档案。 现在,该小组拥有一个Mecurial存放处(黄色!),并且有人使用载有其他人最近变化的同一法典。 换言之,我有原封不动的名录、我对另一台名录的改动、以及第三台名录的 h,原封不动的代码是共同的祖先。
把我的变化合并到雇佣军存放处,有什么好办法? 雇佣军没有共同祖先的历史。 我是Merecurial的新品牌。 我的VCS经验是CVS、Perforce和一些SVN。 Can 我再造两条当地衣帽子,把一只同原法典改写,另一条与我修改的法典,并用雇佣军混为一谈? (如果是,如何?) 或者,我是否应考虑使用一种依赖的合并工具,然后将合并版复制成我的布林目录? 或者说什么?
所有这一切都在RHE-030。
谢谢。
尝试的一个办法就是:
diff -urN your-original-tarball your-current-code > mychanges.patch
hg clone their-current-repo your-local-clone
cd your-local-clone
hg update -r 0 # go to their oldest item in history
hg import --no-commit ../mychanges.patch
# check it out, test, fix any rejected changes, etc.
hg commit -m my changes # <-- you ll be warned this creates new heads
hg merge # merge your changes with their changes since they started using mercurial
hg commit -m merged my solo work with yours
这促使你迄今开展所有工作,根据他们所做的最老的修改,将其进口为新的变化,然后将这项工作与他们从开始使用的工作合并。
理想的情况是,他们给你的ball球,但希望它不会太大。
I am the sole developer on a project and have been using tortoiseSVN for quite a while. Now Id like to start getting version information working correctly in the project I.E. show Major Version, Minor ...
I understand how to merge branches together in git, and I love how easy it makes it. I have a branch that looks like this: project/ |--subproj1/ | |---(files) | |--subproj2/ |---(files) A ...
We still use CVS, I use git and hg for my personal use though I m still a novice at both, but I realize they re much more modern and better, faster, distributed, etc. It s just everyone is so ...
I ve met quite a few people lately who says that 3rd party libraries doesn t belong in version control. These people haven t been able to explain to me why they shouldn t yet, so I hoped you guys ...
I am working in a team of five. We are working on a C# application with five csprojects. The problem is that for each csproject, each of my colleagues has their own ideas on how to reference a DLL; ...
I am using SVN+SSH to check out a working copy of repository from an SVN server on which all developers are members of a developer group and have full read/write permissions on the repository ...
A subversion repository contains the html, latex and man directories that doxygen generates from the source code. Even for small source code changes, new files are being generated with random names ...
Is there a way to search for a file in a subversion repository? Something similar to Unix find command, with which I can find the location of a file in a repository. I know there is svn list, but ...