Hello, I'm a bit lost. I've checked http://lists.wikimedia.org/pipermail/pywikipedia-announce/ and https://www.mediawiki.org/wiki/Manual:Pywikipediabot , including some unobvious subpages, but I can't find any guide on how to convert my pywikipedia checkout from SVN to Git updating. I found the brand-new checkout instructions on the wiki and endless discussions in this mailing list, but nothing of use for me.
Nemo
Is https://www.mediawiki.org/wiki/Manual:Pywikipediabot/Gerrit useful to you? There's no way to "convert" an installation, you just have to re-checkout all the files, and copy your user-config and any other custom scripts into the new directory. -- Legoktm
On Thu, Sep 5, 2013 at 4:13 AM, Federico Leva (Nemo) nemowiki@gmail.comwrote:
Hello, I'm a bit lost. I've checked http://lists.wikimedia.org/**pipermail/pywikipedia-** announce/ http://lists.wikimedia.org/pipermail/pywikipedia-announce/and https://www.mediawiki.org/**wiki/Manual:Pywikipediabothttps://www.mediawiki.org/wiki/Manual:Pywikipediabot, including some unobvious subpages, but I can't find any guide on how to convert my pywikipedia checkout from SVN to Git updating. I found the brand-new checkout instructions on the wiki and endless discussions in this mailing list, but nothing of use for me.
Nemo
______________________________**_________________ Pywikipedia-l mailing list Pywikipedia-l@lists.wikimedia.**org Pywikipedia-l@lists.wikimedia.org https://lists.wikimedia.org/**mailman/listinfo/pywikipedia-lhttps://lists.wikimedia.org/mailman/listinfo/pywikipedia-l
I got the following git message while pushing but the commit-msg hook is already installed (before committing the change). Does anyone has an idea?
git.exe push --progress "origin" master:refs/for/master
Counting objects: 10, done. Delta compression using up to 4 threads. Compressing objects: 100% (6/6), done. Writing objects: 100% (7/7), 871 bytes, done. Total 7 (delta 3), reused 0 (delta 0) remote: Resolving deltas: 100% (3/3) remote: Processing changes: refs: 1, done remote: ERROR: missing Change-Id in commit message footer remote: Suggestion for commit message: remote: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/pywikibot/compat remote: remote: Change-Id: I5563ab61e3017eaeddd30ca270b9916d64f809cb remote: remote: Hint: To automatically insert Change-Id, install the hook: remote: scp -p -P 29418 xqt@gerrit.wikimedia.org:hooks/commit-msg `git rev-parse --git-dir`/hooks/commit-msg remote: remote: To ssh://xqt@gerrit.wikimedia.org:29418/pywikibot/compat ! [remote rejected] master -> refs/for/master (missing Change-Id in commit message footer) error: failed to push some refs to 'ssh://xqt@gerrit.wikimedia.org:29418/pywikibot/compat'
git did not exit cleanly (exit code 1) (2293 ms @ 05.09.2013 17:46:45)
Greetings
xqt
On Thu, Sep 5, 2013 at 8:52 AM, info@gno.de wrote:
I got the following git message while pushing but the commit-msg hook is already installed (before committing the change). Does anyone has an idea?
git.exe push --progress "origin" master:refs/for/master
Counting objects: 10, done. Delta compression using up to 4 threads. Compressing objects: 100% (6/6), done. Writing objects: 100% (7/7), 871 bytes, done. Total 7 (delta 3), reused 0 (delta 0) remote: Resolving deltas: 100% (3/3) remote: Processing changes: refs: 1, done remote: ERROR: missing Change-Id in commit message footer remote: Suggestion for commit message: remote: Merge branch 'master' of ssh:// gerrit.wikimedia.org:29418/pywikibot/compat remote: remote: Change-Id: I5563ab61e3017eaeddd30ca270b9916d64f809cb remote: remote: Hint: To automatically insert Change-Id, install the hook: remote: scp -p -P 29418 xqt@gerrit.wikimedia.org:hooks/commit-msg `git rev-parse --git-dir`/hooks/commit-msg remote: remote: To ssh://xqt@gerrit.wikimedia.org:29418/pywikibot/compat ! [remote rejected] master -> refs/for/master (missing Change-Id in commit message footer) error: failed to push some refs to 'ssh:// xqt@gerrit.wikimedia.org:29418/pywikibot/compat'
git did not exit cleanly (exit code 1) (2293 ms @ 05.09.2013 17:46:45)
Greetings
Offhand, my guess would be that the commit-msg hook isn't platform independent and is giving you problems on Windows. As a workaround, you can amend your latest commit on master (git commit -a --amend) and copy+paste that suggested Change-Id into the message.
-Chad
----- Original Nachricht ---- Von: Chad Horohoe chorohoe@wikimedia.org An: Pywikipedia discussion list pywikipedia-l@lists.wikimedia.org Datum: 05.09.2013 17:58 Betreff: Re: [Pywikipedia-l] Git error message
On Thu, Sep 5, 2013 at 8:52 AM, info@gno.de wrote:
I got the following git message while pushing but the commit-msg hook is already installed (before committing the change). Does anyone has an
idea?
git.exe push --progress "origin" master:refs/for/master
Counting objects: 10, done. Delta compression using up to 4 threads. Compressing objects: 100% (6/6), done. Writing objects: 100% (7/7), 871 bytes, done. Total 7 (delta 3), reused 0 (delta 0) remote: Resolving deltas: 100% (3/3) remote: Processing changes: refs: 1, done remote: ERROR: missing Change-Id in commit message footer remote: Suggestion for commit message: remote: Merge branch 'master' of ssh:// gerrit.wikimedia.org:29418/pywikibot/compat remote: remote: Change-Id: I5563ab61e3017eaeddd30ca270b9916d64f809cb remote: remote: Hint: To automatically insert Change-Id, install the hook: remote: scp -p -P 29418 xqt@gerrit.wikimedia.org:hooks/commit-msg `git rev-parse --git-dir`/hooks/commit-msg remote: remote: To ssh://xqt@gerrit.wikimedia.org:29418/pywikibot/compat ! [remote rejected] master -> refs/for/master (missing Change-Id in
commit
message footer) error: failed to push some refs to 'ssh:// xqt@gerrit.wikimedia.org:29418/pywikibot/compat'
git did not exit cleanly (exit code 1) (2293 ms @ 05.09.2013 17:46:45)
Greetings
Offhand, my guess would be that the commit-msg hook isn't platform independent and is giving you problems on Windows. As a workaround, you can amend your latest commit on master (git commit -a --amend) and copy+paste that suggested Change-Id into the message.
-Chad
Chad, could you explain how to c&p the Change-ID into the message? I am not familar with messaging the push command. Thanks a lot.
xqt
On Thu, Sep 5, 2013 at 9:16 AM, info@gno.de wrote:
----- Original Nachricht ---- Von: Chad Horohoe chorohoe@wikimedia.org An: Pywikipedia discussion list pywikipedia-l@lists.wikimedia.org Datum: 05.09.2013 17:58 Betreff: Re: [Pywikipedia-l] Git error message
On Thu, Sep 5, 2013 at 8:52 AM, info@gno.de wrote:
I got the following git message while pushing but the commit-msg hook
is
already installed (before committing the change). Does anyone has an
idea?
git.exe push --progress "origin" master:refs/for/master
Counting objects: 10, done. Delta compression using up to 4 threads. Compressing objects: 100% (6/6), done. Writing objects: 100% (7/7), 871 bytes, done. Total 7 (delta 3), reused 0 (delta 0) remote: Resolving deltas: 100% (3/3) remote: Processing changes: refs: 1, done remote: ERROR: missing Change-Id in commit message footer remote: Suggestion for commit message: remote: Merge branch 'master' of ssh:// gerrit.wikimedia.org:29418/pywikibot/compat remote: remote: Change-Id: I5563ab61e3017eaeddd30ca270b9916d64f809cb remote: remote: Hint: To automatically insert Change-Id, install the hook: remote: scp -p -P 29418 xqt@gerrit.wikimedia.org:hooks/commit-msg
`git
rev-parse --git-dir`/hooks/commit-msg remote: remote: To ssh://xqt@gerrit.wikimedia.org:29418/pywikibot/compat ! [remote rejected] master -> refs/for/master (missing Change-Id in
commit
message footer) error: failed to push some refs to 'ssh:// xqt@gerrit.wikimedia.org:29418/pywikibot/compat'
git did not exit cleanly (exit code 1) (2293 ms @ 05.09.2013 17:46:45)
Greetings
Offhand, my guess would be that the commit-msg hook isn't platform independent and is giving you problems on Windows. As a workaround, you can amend your latest commit on master (git commit -a --amend) and copy+paste that suggested Change-Id into the message.
-Chad
Chad, could you explain how to c&p the Change-ID into the message? I am not familar with messaging the push command. Thanks a lot.
So, in that error response to you it said:
remote: Suggestion for commit message: [snip] remote: Change-Id: I5563ab61e3017eaeddd30ca270b9916d64f809cb
That change-id is an acceptable unused one that you can use right away. So copy that, then amend your commit like I suggested (git commit -a --amend), paste the change-id in the footer. Then try pushing like you did (that part was correct :))
-Chad
On Sep 5, 2013 11:58 AM, "Chad Horohoe" chorohoe@wikimedia.org wrote:
Offhand, my guess would be that the commit-msg hook isn't platform independent and is giving you problems on Windows. As a workaround, you can amend your latest commit on master (git commit -a --amend) and copy+paste that suggested Change-Id into the message.
or the hook was installed in the wrong place or has the wrong perms? (execute bit?)
or maybe it's the environment. try using git bash? or else just ditch windows!
-Jeremy
----- Original Nachricht ---- Von: Chad Horohoe chorohoe@wikimedia.org An: Pywikipedia discussion list pywikipedia-l@lists.wikimedia.org Datum: 05.09.2013 18:18 Betreff: Re: [Pywikipedia-l] Git error message
On Thu, Sep 5, 2013 at 9:16 AM, info@gno.de wrote:
----- Original Nachricht ---- Von: Chad Horohoe chorohoe@wikimedia.org An: Pywikipedia discussion list pywikipedia-l@lists.wikimedia.org Datum: 05.09.2013 17:58 Betreff: Re: [Pywikipedia-l] Git error message
On Thu, Sep 5, 2013 at 8:52 AM, info@gno.de wrote:
I got the following git message while pushing but the commit-msg hook
is
already installed (before committing the change). Does anyone has an
idea?
git.exe push --progress "origin" master:refs/for/master
Counting objects: 10, done. Delta compression using up to 4 threads. Compressing objects: 100% (6/6), done. Writing objects: 100% (7/7), 871 bytes, done. Total 7 (delta 3), reused 0 (delta 0) remote: Resolving deltas: 100% (3/3) remote: Processing changes: refs: 1, done remote: ERROR: missing Change-Id in commit message footer remote: Suggestion for commit message: remote: Merge branch 'master' of ssh:// gerrit.wikimedia.org:29418/pywikibot/compat remote: remote: Change-Id: I5563ab61e3017eaeddd30ca270b9916d64f809cb remote: remote: Hint: To automatically insert Change-Id, install the hook: remote: scp -p -P 29418 xqt@gerrit.wikimedia.org:hooks/commit-msg
`git
rev-parse --git-dir`/hooks/commit-msg remote: remote: To ssh://xqt@gerrit.wikimedia.org:29418/pywikibot/compat ! [remote rejected] master -> refs/for/master (missing Change-Id in
commit
message footer) error: failed to push some refs to 'ssh:// xqt@gerrit.wikimedia.org:29418/pywikibot/compat'
git did not exit cleanly (exit code 1) (2293 ms @ 05.09.2013
17:46:45)
Greetings
Offhand, my guess would be that the commit-msg hook isn't platform independent and is giving you problems on Windows. As a workaround, you can amend your latest commit on master (git commit -a --amend) and copy+paste that suggested Change-Id into the message.
-Chad
Chad, could you explain how to c&p the Change-ID into the message? I am not familar with messaging the push command. Thanks a lot.
So, in that error response to you it said:
remote: Suggestion for commit message: [snip] remote: Change-Id: I5563ab61e3017eaeddd30ca270b9916d64f809cb
That change-id is an acceptable unused one that you can use right away. So copy that, then amend your commit like I suggested (git commit -a --amend), paste the change-id in the footer. Then try pushing like you did (that part was correct :))
-Chad
I did it in that way but got the same error.
xqt
Den 05-09-2013 17:03, legoktm skrev:
Is https://www.mediawiki.org/wiki/Manual:Pywikipediabot/Gerrit useful to you?
No. Not for me. I have not found a way be able to use for example add_text.py from compat.
There's no way to "convert" an installation, you just have to re-checkout all the files, and copy your user-config and any other custom scripts into the new directory. -- Legoktm
I want more information on installation proces.
/Steen
On Fri, Sep 6, 2013 at 1:46 PM, Steen Thomassen steen.thomassen@gmail.comwrote:
Den 05-09-2013 17:03, legoktm skrev:
Is https://www.mediawiki.org/**wiki/Manual:Pywikipediabot/**Gerrithttps://www.mediawiki.org/wiki/Manual:Pywikipediabot/Gerrituseful to you?
No. Not for me. I have not found a way be able to use for example add_text.py from compat.
What about
https://www.mediawiki.org/wiki/Manual:Pywikipediabot/Installation ?
There's no way to "convert" an installation, you just have to re-checkout
all the files, and copy your user-config and any other custom scripts into the new directory. -- Legoktm
I want more information on installation proces.
/Steen
______________________________**_________________ Pywikipedia-l mailing list Pywikipedia-l@lists.wikimedia.**org Pywikipedia-l@lists.wikimedia.org https://lists.wikimedia.org/**mailman/listinfo/pywikipedia-lhttps://lists.wikimedia.org/mailman/listinfo/pywikipedia-l
Den 07-09-2013 18:51, Amir Ladsgroup skrev:
On Fri, Sep 6, 2013 at 1:46 PM, Steen Thomassen <steen.thomassen@gmail.com mailto:steen.thomassen@gmail.com> wrote:
Den 05-09-2013 17:03, legoktm skrev: Is https://www.mediawiki.org/wiki/Manual:Pywikipediabot/Gerrit useful to you? No. Not for me. I have not found a way be able to use for example add_text.py from compat.
What about https://www.mediawiki.org/wiki/Manual:Pywikipediabot/Installation ?
It is better. core is ok, but i have still problems with compat:
mkdir pywikipedia cd pywikipedia git clone --recursive https://gerrit.wikimedia.org/r/pywikibot/compat.git git clone --recursive https://gerrit.wikimedia.org/r/pywikibot/core.git
mkdir .pywikibot copy user-config.py and user-fixes.py
** my .profile ***
PYTHONPATH=$PYTHONPATH:~/pywikipedia/core/ export PYTHONPATH
PYWIKIBOT_DIR=~/.pywikibot export PYWIKIBOT_DIR
Traceback (most recent call last): File "../../compat/add_text.py", line 79, in <module> import wikipedia as pywikibot File "/home/username/pywikipedia/compat/wikipedia.py", line 156, in <module> from pywikibot.support import * File "/home/username/pywikipedia/compat/pywikibot/support.py", line 15, in <module> from exceptions import * File "/home/username/pywikipedia/compat/pywikibot/exceptions.py", line 14, in <module> import config File "/home/username/pywikipedia/compat/config.py", line 578, in <module> for _filename in os.listdir(os.path.join(_base_dir, 'families')): OSError: [Errno 2] No such file or directory: '/home/username/.pywikibot/families'
/Steen
On Sun, Sep 8, 2013 at 2:37 AM, Steen Thomassen steen.thomassen@gmail.comwrote:
Den 07-09-2013 18:51, Amir Ladsgroup skrev:
On Fri, Sep 6, 2013 at 1:46 PM, Steen Thomassen < steen.thomassen@gmail.com> wrote:
Den 05-09-2013 17:03, legoktm skrev:
Is https://www.mediawiki.org/wiki/Manual:Pywikipediabot/Gerrit useful
to you?
No. Not for me. I have not found a way be able to use for example add_text.py from compat.
What about
https://www.mediawiki.org/wiki/Manual:Pywikipediabot/Installation ?
It is better. core is ok, but i have still problems with compat:
mkdir pywikipedia cd pywikipedia git clone --recursive https://gerrit.wikimedia.org/r/pywikibot/compat.git git clone --recursive https://gerrit.wikimedia.org/r/pywikibot/core.git
mkdir .pywikibot copy user-config.py and user-fixes.py
** my .profile ***
PYTHONPATH=$PYTHONPATH:~/pywikipedia/core/ export PYTHONPATH
PYWIKIBOT_DIR=~/.pywikibot export PYWIKIBOT_DIR
Traceback (most recent call last): File "../../compat/add_text.py", line 79, in <module> import wikipedia as pywikibot File "/home/username/pywikipedia/compat/wikipedia.py", line 156, in
<module> from pywikibot.support import * File "/home/username/pywikipedia/compat/pywikibot/support.py", line 15, in <module> from exceptions import * File "/home/username/pywikipedia/compat/pywikibot/exceptions.py", line 14, in <module> import config File "/home/username/pywikipedia/compat/config.py", line 578, in <module> for _filename in os.listdir(os.path.join(_base_dir, 'families')): OSError: [Errno 2] No such file or directory: '/home/username/.pywikibot/families'
It's a bug and needs to be fixed but for a fast solution, copy your
user-fixes.py and user-config.py to the compat folder I think It will erase the error but I need to fix it in long-term
/Steen
Pywikipedia-l mailing list Pywikipedia-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l
No, I know about that page but it's not useful. I know I must do a new checkout, but I'd use a guide on how to do so in the best way. How to list "my" files in the folder (there are so many...)? What will happen with files with local modifications (svn handles them very easily)? What changes in git compared to what you can/have to do with svn?
For now I only tried making the checkout and then moving over all old files, but then I can't merge them because git thinks everything is up to date. I guess I can try doing the opposite, but it's so easy to waste hours and get terrible headaches with git that I know I'll be too lazy to do any update for months (until something breaks horribly) unless I have a guide. Thanks.
Nemo
No, I know about that page but it's not useful. I know I must do a new checkout, but I'd use a guide on how to do so in the best way. How to list "my" files in the folder (there are so many...)? What will happen with files with local modifications (svn handles them very easily)? What changes in git compared to what you can/have to do with svn?
For now I only tried making the checkout and then moving over all old files, but then I can't merge them because git thinks everything is up to date. I guess I can try doing the opposite, but it's so easy to waste hours and get terrible headaches with git that I know I'll be too lazy to do any update for months (until something breaks horribly) unless I have a guide. Thanks.
Nemo
+1 There is a problem with changes on the working copy which are not committed or stashed. Pulling the repo often fails with the following:
C:\pwb\compat>git pull "origin" master -v --progress
* branch master -> FETCH_HEAD Updating f9f28e8..9fe0bc2 error: Your local changes to the following files would be overwritten by merge: externals/__init__.py Please, commit your changes or stash them before you can merge. Aborting
svn merged it automatically if there where no conficts and if there where some conflicts I could easy solve it. Any ideas for that flow with git?
xqt
On 9 September 2013 12:31, info@gno.de wrote:
+1 There is a problem with changes on the working copy which are not committed or stashed. Pulling the repo often fails with the following:
C:\pwb\compat>git pull "origin" master -v --progress From https://gerrit.wikimedia.org/r/pywikibot/compat
- branch master -> FETCH_HEAD
Updating f9f28e8..9fe0bc2 error: Your local changes to the following files would be overwritten by merge: externals/__init__.py Please, commit your changes or stash them before you can merge. Aborting
svn merged it automatically if there where no conficts and if there where some conflicts I could easy solve it. Any ideas for that flow with git?
Untested, but you could try:
git stash git pull git stash pop
Merlijn
I always use git stash git pull
And It works for me
On Mon, Sep 9, 2013 at 3:56 PM, Merlijn van Deen valhallasw@arctus.nlwrote:
On 9 September 2013 12:31, info@gno.de wrote:
+1 There is a problem with changes on the working copy which are not committed or stashed. Pulling the repo often fails with the following:
C:\pwb\compat>git pull "origin" master -v --progress From https://gerrit.wikimedia.org/r/pywikibot/compat
- branch master -> FETCH_HEAD
Updating f9f28e8..9fe0bc2 error: Your local changes to the following files would be overwritten by merge: externals/__init__.py Please, commit your changes or stash them before you can merge. Aborting
svn merged it automatically if there where no conficts and if there where some conflicts I could easy solve it. Any ideas for that flow with git?
Untested, but you could try:
git stash git pull git stash pop
Merlijn
Pywikipedia-l mailing list Pywikipedia-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l
There is a problem with changes on the working copy which are not committed or stashed. Pulling the repo often fails with the following:
C:\pwb\compat>git pull "origin" master -v --progress From https://gerrit.wikimedia.org/r/pywikibot/compat
- branch master -> FETCH_HEAD
Updating f9f28e8..9fe0bc2 error: Your local changes to the following files would be overwritten by merge: externals/__init__.py Please, commit your changes or stash them before you can merge. Aborting
svn merged it automatically if there where no conficts and if there where some conflicts I could easy solve it. Any ideas for that flow with git?
Untested, but you could try:
git stash git pull git stash pop
Looks good to me. "git stash pop" unhides the changes and I again can easily see the modified files (with tortoisgit).
Thanks
xqt
Den 08-09-2013 07:09, Amir Ladsgroup skrev:
File "/home/username/pywikipedia/compat/config.py", line 578, in
<module>
for _filename in os.listdir(os.path.join(_base_dir, 'families')): OSError: [Errno 2] No such file or directory: '/home/username/.pywikibot/families'
It's a bug and needs to be fixed but for a fast solution, copy your user-fixes.py and user-config.py to the compat folder I think It will erase the error but I need to fix it in long-term
Is workaround don't work. It was not a solution. Same error messsage.
/Steen
for _filename in os.listdir(os.path.join(_base_dir, 'families')): OSError: [Errno 2] No such file or directory: '/home/username/.pywikibot/families'
Looks like you have compat in "/home/username/pywikipedia/compat/" but _base_dir is '/home/username/.pywikibot'
_base_dir is determined in the following order - 1. If the script was called with a -dir: argument, use the directory provided in this argument 2. If the user has a PYWIKIBOT_DIR environment variable, use the value of it 3. If the script was started from a directory that contains a user-config.py file, use this directory as the base 4. If all else fails, use the directory from which this module was loaded. 5. If the user-config.py file is not found, another will be created in the current directory, following in the footsteps of project, language and bot username.
To me you must make sure _base_dir will return "/home/username/pywikipedia/compat/", so it will find subdir families.
On Wed, Sep 11, 2013 at 5:12 PM, Steen Thomassen steen.thomassen@gmail.comwrote:
Den 08-09-2013 07:09, Amir Ladsgroup skrev:
File "/home/username/pywikipedia/compat/config.py", line 578, in <module>
for _filename in os.listdir(os.path.join(_base_dir, 'families')):
OSError: [Errno 2] No such file or directory: '/home/username/.pywikibot/families'
It's a bug and needs to be fixed but for a fast solution, copy your
user-fixes.py and user-config.py to the compat folder I think It will erase the error but I need to fix it in long-term
Is workaround don't work. It was not a solution. Same error messsage.
/Steen
Pywikipedia-l mailing list Pywikipedia-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l
For the records, I've been happy to see some work on wiki documentation, but if a guide for SVN checkout conversion appeared I've missed it. I tried to do 1) checkout of compat, 2) copy of old checkout over new one, and 3) git stash / git pull / git stash pop as suggested in https://www.mediawiki.org/wiki/Bugzilla/Fields , but git pull claims everything is up to date and while I get my files back the checkout is broken. Hence, still using last SVN version (+ the https hack).
Nemo
I meant: as suggested in http://lists.wikimedia.org/pipermail/pywikipedia-l/2013-September/008338.htm... ...
Federico Leva (Nemo), 16/10/2013 10:10:
For the records, I've been happy to see some work on wiki documentation, but if a guide for SVN checkout conversion appeared I've missed it. I tried to do
- checkout of compat,
- copy of old checkout over new one, and
- git stash / git pull / git stash pop
as suggested in https://www.mediawiki.org/wiki/Bugzilla/Fields , but git pull claims everything is up to date and while I get my files back the checkout is broken. Hence, still using last SVN version (+ the https hack).
Nemo
I've still not seen any instructions, BTW. Having to move files one by one from old to new checkout is a pain.
Nemo
Hallo Federico Leva (Nemo):
I've still not seen any instructions, BTW. Having to move files one by one from old to new checkout is a pain.
To be honest, at least to me it's not really clear what you're trying to achieve and what the troubles you're experiencing are. In an earlier mail you wrote
but git pull claims everything is up to date and while I get my files back the checkout is broken. Hence, still using last SVN version (+ the https hack)
but it's unclear in which way the checkout is broken.
pywikipedia-l@lists.wikimedia.org