Hi Merlijn,
I was cloning from yours clone on github ( https://github.com/wikimedia/pywikibot-core). If git should be wikimedia VCS of choice, head/master should be maintained in git. 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.
best
2013/7/22 Merlijn van Deen valhallasw@arctus.nl
Hi Tomasz,
What do you mean with 'your repository'? Did you use svn-git to create it, or is it a clone from gerrit/github?
If it's the first, this is expected behavior - we do not use svn-git to convert the repository, but rather KDE's svn2git - see https://github.com/pywikibot/svn2git . Several things are different: not all paths are converted, there is an added comment to the commit message, etc. This conversion runs every hour (from the top of my head), and will force push into gerrit. Thus, SVN is our master repository, and submitting patches via gerrit is not possible yet.
Best, Merlijn
On 22 July 2013 20:22, Tomasz Magulski tomasz.magulski@gmail.com wrote:
It has been done again. I don't know what's Your workflow, but it will make some serious problems for people, who want to contribute using git as vcs of choice.
2013/7/22 Tomasz Magulski tomasz.magulski@gmail.com
I've synced yesterday my repo with this availiable in gerrit/github, so yesterday it was up to date.
Today, when I was merging my master branch it seemed that I had circa 830 commits to mutual parent with gerrit/github and the same situation occur for gerrit/gihub (it has circa 830 comitis to our mutual parent), so I start digging and found out that uncommon commits (this 830) look (as far as commit comment) the same.
So my suspicion is that someone (legoktm) has been independently importing new commits from svn to git repo (so they look exactly the same but don't have the same commit hash) and has pushed them to directly gerrit without merging with master?
Could we do something to avoid that kind of situations?
cheers
-- Tomasz Magulski
-- Tomasz Magulski
Pywikipedia-l mailing list Pywikipedia-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l
Pywikipedia-l mailing list Pywikipedia-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l