2013/7/23 Merlijn van Deen valhallasw@arctus.nl
On 22 July 2013 22:02, Tomasz Magulski tomasz.magulski@gmail.com wrote:
I was cloning from yours clone on github ( https://github.com/wikimedia/pywikibot-core).
Hm, that's weird. There should be no reason for the conversion to push new SHA1s for the same commit (if the conversion doesn't change, anyway). I'll try to look into it.
You can for example compare my repo master branch with that available from wikimedia https://github.com/magul/pywikibot-core and https://github.com/wikimedia/pywikibot-compat (oops it looks like wikimedia mater has been changed again, and my master is up to date with wikimedia master). The difference starts at march 21th, I guess it's the time, when wikimedia make pywikibot's git repository publicly available.
If git should be wikimedia VCS of choice, head/master should be maintained in git.
We are in the middle of converting, so this is not a reasonable thing to ask. We *will* maintain in git, but *for now* (until the 26th, if everything is done by then) we still have SVN as master and git as mirror.
Yep, after posting my previous mail I've found the thread about it in archive of list. I will not complain, just wait for migration to be finished - there's only 3 days left.
I haven't tested it, but it seems reasonable, that every operation of
svn2git crate new hashtags of commits in git and from point of view of git repository they aren't identical, so merging that repository make mess in history of commits.
Running the conversion twice should never give different SHA1s for the same commit, unless something changes in the conversion code.
It looks like commit's hash is SHA-1 calculated so that it makes the
problem more awkward. I guess (it's long shot, but...), that maybe few independent svn2git operation had been done and so (maybe) there is difference in commiter to git repository (in the meaning of person, who make the svn2git), and thus the commit hash changed.
But it should be problem only for few more days, so don't waste Your time on it.
best!
Merlijn
Pywikipedia-l mailing list Pywikipedia-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l