merge - Merging two mercurcial repositories of the same project -
i have old mercurial repository project has changes before date, , have repository same project changes after date.
i want merge these 2 repositories history reflects first commit in latter repository kid of lastly commit in former repository.
is possible? or have merge both heads?
reading here: http://blog.experimentalworks.net/2009/03/merge-vs-rebase-a-deep-dive-into-the-mysteries-of-revision-control/ , here: http://mercurial.selenic.com/wiki/rebaseextension
i looks wanting accomplish can done rebase, caveats.
i pull changes newer repo older repo. results in 2 heads since both repos have 'default' branch. in older repo folder, ran:
hg pull -f ../newer-repo
then have utilize hg phases create pulled changes malleable. normally, bad idea, since know developer on project, can safely.
hg phase -f -d -r 15 16 ...
finally, can rebase because history pulled in newer repo begins same state lastly changelist in old repo.
hg rebase -s 15 -d 14
i have single history , no conflicts. wont work everyone, in narrow circumstance, needed.
merge mercurial
No comments:
Post a Comment