Home Original page

[Python-Dev] Submitting changes through Mercurial

Éric Araujo merwok at netwok.org
Fri Mar 25 22:51:03 CET 2011 
> Make sure to submit issues to the meta tracker, please.

Right, I’ll do that.  Since you have questions in this message, for now
I’ll continue here.

>> - The first patch was empty (note that the repo was not up to date).
> This I don't understand. What repo was not up to date?

I mean that my linked repo didn’t have all changesets from
hg.python.org/cpython.  I don’t think it should matter, but I don’t know
why the diff was empty, so I thought this information might help.

>> - After pulling, merging and pushing, the patch created contained the
>> merge diff, not the useful diff with my changes.
> Again, please elaborate. What is the "merge diff" that it contained?

See http://bugs.python.org/file21398/c43e264256e4.diff : this
corresponds to a merge I did from default into my branch,
http://hg.python.org/sandbox/merwok/rev/c43e264256e4 .  It should have
been a diff corresponding to my branch - cpython’s main repo default
branch head IIUC.

Regards
More information about the Python-Dev mailing list