While my preference is to toss hg.python.org, because it gives us
nothing but trouble,
I propose to try this:
- edit .hgeol
- enter <name> = BIN explicitly for the four involved files at the end
- ...(well, you wrote this, below)
get the changes to the server
- undo the .hgeol change
This is boring stuff, this hook-thing really should not insist to
check intermediate versions...
On 15/01/14 10:36, Anselm Kruis wrote:
Any progress so far? I found old discussions on python-dev:
https://mail.python.org/pipermail/python-dev/2011-March/110063.html
https://mail.python.org/pipermail/python-dev/2012-May/119214.html
https://mail.python.org/pipermail/python-committers/2011-May/001685.html
Perhaps it is possible to
- push a change to the the .hgeol file to hg.python.org
- merge this change back into the stackless-dev/stackless repo on
bitbucket
- push everything to hg.python.org
- revert the change to .hgeol
But this procedure is really ugly!
If it is not possible to disable this hook, I volunteer to rewrite the
history. After all it were my commits, that caused all this trouble.
Fortunately stackless-dev/stackless is not yet public. Therefore it
shouldn't be to hard, to update all clones. To rewrite the history I
would create new heads just before my commits, reapply all changes
with correct line endings and finally close the old heads.
Cheers
Anselm
Am 14.01.2014 12:44, schrieb Anselm Kruis:
Now that our integration repository is on bitbucket, we should try to
get the checks disabled for hg.python.org/stackless.
Cheers
Anselm
Am 14.01.2014 05:29, schrieb Richard Tew:
Or someone can get the line ending thing disabled for the
hg.python.org repo on the server-side. Even if just for several days
for those revisions to be pushed. That's what we did when importing
the repository IIRC.
Cheers,
Richard.
On 1/14/14, Christian Tismer <[email protected]> wrote:
I have checked some of these revisions.
The reports are from versions which are not current.
My hope was that the versions are only checked in the most
recent revision, which was unfortunately not the case.
I think hg.python.org is pushing the rules too far here.
Anyway, if we want to check out changes to hg.python.org,
I fear we have to re-write history.
This seems to affect four files.
We would need to:
- undo all the changes from where they occurred, fix the files, and
re-apply
the changes. This is a lot of work.
- this also means history re-writing.
cheers - Chris
On 13.01.14 06:38, Richard Tew wrote:
D:\VCS\HG\Python\stackless>hg push -b 2.7-slp --new-branch
ssh://[email protected]/stackless
*** failed to import extension xeol: No module named xeol
pushing to ssh://[email protected]/stackless
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 68 changesets with 159 changes to 62 files
remote: error: pretxnchangegroup.eol hook failed: end-of-line check
failed:
remote: Stackless/unittests/test_tracing.py in 92a8e005e75c should
not have CRLF line endings
remote: Stackless/unittests/test_tracing.py in 5ffff9187628 should
not have CRLF line endings
remote: Stackless/unittests/test_tracing.py in d5a022408fc2 should
not have CRLF line endings
remote: Stackless/core/stackless_impl.h in d47f6ef396d5 should not
have CRLF line endings
remote: transaction abort!
remote: rollback completed
remote: abort: end-of-line check failed:
remote: Stackless/unittests/test_tracing.py in 92a8e005e75c should
not have CRLF line endings
remote: Stackless/unittests/test_tracing.py in 5ffff9187628 should
not have CRLF line endings
remote: Stackless/unittests/test_tracing.py in d5a022408fc2 should
not have CRLF line endings
remote: Stackless/core/stackless_impl.h in d47f6ef396d5 should not
have CRLF line endings
Hmm...
Any ideas?
Cheers,
Richard.
_______________________________________________
Stackless mailing list
[email protected]
http://www.stackless.com/mailman/listinfo/stackless
--
Christian Tismer :^) <mailto:[email protected]>
Software Consulting : Have a break! Take a ride on
Python's
Karl-Liebknecht-Str. 121 : *Starship*
http://starship.python.net/
14482 Potsdam : PGP key -> http://pgp.uni-mainz.de
phone +49 173 24 18 776 fax +49 (30) 700143-0023
PGP 0x57F3BF04 9064 F4E1 D754 C2FF 1619 305B C09C 5A3B 57F3
BF04
whom do you want to sponsor today? http://www.stackless.com/
_______________________________________________
Stackless mailing list
[email protected]
http://www.stackless.com/mailman/listinfo/stackless
_______________________________________________
Stackless mailing list
[email protected]
http://www.stackless.com/mailman/listinfo/stackless
--
Christian Tismer :^) <mailto:[email protected]>
Software Consulting : Have a break! Take a ride on Python's
Karl-Liebknecht-Str. 121 : *Starship* http://starship.python.net/
14482 Potsdam : PGP key -> http://pgp.uni-mainz.de
phone +49 173 24 18 776 fax +49 (30) 700143-0023
PGP 0x57F3BF04 9064 F4E1 D754 C2FF 1619 305B C09C 5A3B 57F3 BF04
whom do you want to sponsor today? http://www.stackless.com/
_______________________________________________
Stackless mailing list
[email protected]
http://www.stackless.com/mailman/listinfo/stackless
