search

erlehmann / minetest-delta

Fork of minetest-c55 with additional experimental features.
28 stars 12 forks source link

Erlehmann #9

Closed bcmpinc closed 13 years ago

bcmpinc commented 13 years ago

I've imported all new commits from celeron55 using the latest hg-git. However, hg-git has changed since then and thereby creates an entirely new history tree in git. I've rebased your changes on this new tree. Could you please do the following, to start using this new tree? 

git checkout master
git remote add bcmpinc git@github.com:bcmpinc/minetest-delta.git
git fetch bcmpinc
git diff master bcmpinc/erlehmann
git reset --hard bcmpinc/erlehmann
git push origin master -f

The bcmpinc/erlehmann branch contains practically the same as your master branch. You can verify this with the git diff step. The .hgtags file was created by hg-git.

Then we can keep using the new hg-git for synching with celeron55's repository. In the future I might also create a fork of celeron55's on bitbucket, such that he can easily pull in changes.

erlehmann commented 13 years ago

I use hg-fast-export. What is the benefit of using your tree?

bcmpinc commented 13 years ago

That other people can also import changes from upstream. hg-git is quite easy to use for that purpose. However, if you could document how to use hg-fast-export for that purpose, that would be a better way to let other people import changes from upstream/bitbucket forks.