Please help Matt sync up the repos

[mchaput]

I'm trying to figure out how to update whoosh-community/whoosh with the newest changes from my hg repo.

First question, how was this repo created? If try to export my hg repo using hg-git, 1. when I push from hg to a git repo, it doesn't seem to export the branches, and 2. when I make a git repo using hg-git, the commit hashes are different to the hashes of the corresponding commits here.

[stevennic]

Hi Matt,

I don't know anything about Mercurial, but I'm wondering since there are only a handful of branches on Bitbucket, could you not just bring them over manually as follows?

1. Clone whoosh-community to your machine
2. Create and check out a new branch in this repo to mirror the one you'll import from Hg, such as nextgen
3. Manually copy over your source files from Hg for that branch, overwriting the whoosh-community files
4. Check in the branch
5. Merge master into it to reconcile the differences
6. Repeat for each branch

I've never tried this, but you might be able to get around the complexities of migrating from Hg to git.

[martenson]

when I make a git repo using hg-git, the commit hashes are different to the hashes of the corresponding commits here

I am not sure this can be prevented. Conversion of hg to git repo sounds like something that is not deterministic.

If you want to preserve commit atomicity you could probably loop through the next-gen specific commits, create patches, and apply them on top of a copy of master in the git repo. I am not sure how many conflicts are expected between master and nextgen though.

[PythonLinks]

Hello.
I have been watching Whoosh for many years, and finally have a great application for it.
Of course there are these varous problems with the two versions.

Here is my understanding of the situation. mchaput is the original Whoosh owner. He also owns the Whoosh name on PyPi. He is using mercurial. When bitbucket dropped mercurial, the whoosh community was created on Github, but matt continue to use mercurial, and the two versions diverged. Now there is a desore to merge the two, but no one is sufficiently motivated to make it happen.

Is this correct?

How many commits have been made on both branches since they forked? Which direction is it easier to merger?

How about loosing the individual commit records, and just copying over his version and manually resulving the differences with recursive diff?

[stevennic]

That is my understanding. I think we've agreed that whoosh-community will be the official repository for Whoosh and Matt has asked for some help moving it over from Mercurial. If you're able to help, you're welcome to contribute to the effort.

[PythonLinks]

There are so many search engines out there, I have no idea which one I should be using.

[tobiaseisenschenk]

@mchaput did you have any success in copying over the changes manually to this repo?