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
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
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
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
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.
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.
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.
Merlijn
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
On 23 July 2013 12:23, Tomasz Magulski tomasz.magulski@gmail.com wrote:
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.
Huh, this is really strange. Your repository has 2607 commits, while the wikimedia/ one has only 1781.
March 21st was not a special date -- the initial conversion was done June 18th...
If you cloned your repository more than a month ago, that might have caused this - the last change to the conversion was June 22, I think.
Best, Merlijn
2013/7/23 Merlijn van Deen valhallasw@arctus.nl
On 23 July 2013 12:23, Tomasz Magulski tomasz.magulski@gmail.com wrote:
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.
Huh, this is really strange. Your repository has 2607 commits, while the wikimedia/ one has only 1781.
If You will download my git repo You and check it's history with --graph option you will see this additional 830 commits in merged branch. they are the same as in trunk, but have different commit hash.
March 21st was not a special date -- the initial conversion was done June
18th...
I have found this date as beginning of migration e.g. here: http://blog.wikimedia.org/2012/02/15/wikimedia-engineering-moving-from-subve... But I was wrong, because the border date, when the problem first occur is august 21th 2011 (chech the commit line in my repo's master).
best!
If you cloned your repository more than a month ago, that might have caused this - the last change to the conversion was June 22, I think.
Best, Merlijn
Pywikipedia-l mailing list Pywikipedia-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l
On 23 July 2013 13:06, Tomasz Magulski tomasz.magulski@gmail.com wrote:
March 21st was not a special date -- the initial conversion was done June 18th...
But I was wrong, because the border date, when the problem first occur is august 21th 2011 (chech the commit line in my repo's master).
OK. Check the difference between https://github.com/magul/pywikibot-core/commit/dc06e56b06c5efe4d96175a1561f1... and https://github.com/magul/pywikibot-core/commit/7be9e9fb47fc2587b190401be6440...
This could either be caused by an intermittent problem in the conversion, or it could be you cloned the repository before the addition of submodule updates (which was roughly a month ago). When did you clone it?
Merlijn
2013/7/23 Merlijn van Deen valhallasw@arctus.nl
On 23 July 2013 13:06, Tomasz Magulski tomasz.magulski@gmail.com wrote:
March 21st was not a special date -- the initial conversion was done June 18th...
But I was wrong, because the border date, when the problem first occur is august 21th 2011 (chech the commit line in my repo's master).
OK. Check the difference between
https://github.com/magul/pywikibot-core/commit/dc06e56b06c5efe4d96175a1561f1... and
https://github.com/magul/pywikibot-core/commit/7be9e9fb47fc2587b190401be6440...
This could either be caused by an intermittent problem in the conversion, or it could be you cloned the repository before the addition of submodule updates (which was roughly a month ago). When did you clone it?
I was cloning repo multiple times to find out what's the problem, but every cloning was made in 5 last days.
Merlijn
Pywikipedia-l mailing list Pywikipedia-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l