> I'm actually okay with that too, as long as the issue that precipitated the
> commit isn't closed until it's been merged to 2.6svn. Maybe that's the right
> way to handle this then -- when you commit a fix to 2.6hg, be sure there's an
> open release blocker issue on 2.6 with either a changeset o
> One of the differences between the Mercurial and Subversion 2.6 branches were
> the line endings for various Windows files. This change is not appropriate
> for 2.6, which is in security-fix only mode. I reverted these changes in the
> Mercurial 2.6 branch, but now I can't push it.
For the 2.5
>> It would be better, IMO, if there was a single developer who would
>> migrate changes to svn, or to have some semi-automatic procedure for
>> that.
>
> Yep. It's rather a pain to determine what those changes are though if the
> best you can do is a recursive diff on the two trees.
You can do
On Fri, 20 May 2011 21:09:02 -0400, Barry Warsaw wrote:
> I asked around on #python-dev and it was suggested that I add some entries
> into .hgeol, which I've done:
>
> Doc/make.bat = CRLF
> Tools/buildbot/*.bat = CRLF
> Tools/msi/merge.py = CRLF
> PC/VS7.1/*.bat = CRLF
> PC/VS8.0/*.bat = CRLF
>
Okay all you Mercurial experts, I need some help!
One of the differences between the Mercurial and Subversion 2.6 branches were
the line endings for various Windows files. This change is not appropriate
for 2.6, which is in security-fix only mode. I reverted these changes in the
Mercurial 2.6 br
In article <4dd693b0.4070...@python.org>,
Michael Foord wrote:
> On 20/05/2011 16:47, Nick Coghlan wrote:
> > On Sat, May 21, 2011 at 12:07 AM, Jesse Noller wrote:
> >> He can scan it, or take a photo and send it to us. Tell him to contact
> >> me if he has issues.
> > This comes up every time,
On Fri, May 20, 2011 at 3:34 PM, Barry Warsaw wrote:
> On May 21, 2011, at 12:19 AM, Martin v. Löwis wrote:
>
>>Am 20.05.2011 23:37, schrieb Barry Warsaw:
>>> I believe I've reconciled the Python 2.6 hg and svn branches. I've
>>> committed
>>> the changes to 2.6svn and working on the null merges
On May 21, 2011, at 12:19 AM, Martin v. Löwis wrote:
>Am 20.05.2011 23:37, schrieb Barry Warsaw:
>> I believe I've reconciled the Python 2.6 hg and svn branches. I've committed
>> the changes to 2.6svn and working on the null merges for the 2.6hg branch.
>> I'll push the latter at some point soon
On May 20, 2011, at 03:12 PM, Guido van Rossum wrote:
>On Fri, May 20, 2011 at 2:37 PM, Barry Warsaw wrote:
>> I believe I've reconciled the Python 2.6 hg and svn branches. I've committed
>> the changes to 2.6svn and working on the null merges for the 2.6hg branch.
>> I'll push the latter at som
Am 20.05.2011 23:37, schrieb Barry Warsaw:
> I believe I've reconciled the Python 2.6 hg and svn branches. I've committed
> the changes to 2.6svn and working on the null merges for the 2.6hg branch.
> I'll push the latter at some point soonish. Anyway, this means that I will
> cut 2.6.7rc2 today
On Fri, May 20, 2011 at 2:37 PM, Barry Warsaw wrote:
> I believe I've reconciled the Python 2.6 hg and svn branches. I've committed
> the changes to 2.6svn and working on the null merges for the 2.6hg branch.
> I'll push the latter at some point soonish. Anyway, this means that I will
> cut 2.6.
I believe I've reconciled the Python 2.6 hg and svn branches. I've committed
the changes to 2.6svn and working on the null merges for the 2.6hg branch.
I'll push the latter at some point soonish. Anyway, this means that I will
cut 2.6.7rc2 today -- and actually announce it!
In the future, if you
On 20/05/2011 16:47, Nick Coghlan wrote:
On Sat, May 21, 2011 at 12:07 AM, Jesse Noller wrote:
He can scan it, or take a photo and send it to us. Tell him to contact
me if he has issues.
This comes up every time, so if we can't get the main pydotorg page
fixed, we *really* should mention these
On Sat, May 21, 2011 at 12:07 AM, Jesse Noller wrote:
> He can scan it, or take a photo and send it to us. Tell him to contact
> me if he has issues.
This comes up every time, so if we can't get the main pydotorg page
fixed, we *really* should mention these two alternatives in the
devguide.
Chee
(Not sure if this was sent on the first attempt)
Also please have him subscribe to python-committers.
--
Eric.
Victor Stinner wrote:
Le vendredi 20 mai 2011 à 09:18 -0400, Jesse Noller a écrit : > Please make
sure he sends in a contributor agreement I am in contact with Charles-François.
I
On Fri, May 20, 2011 at 9:42 AM, Victor Stinner
wrote:
> Le vendredi 20 mai 2011 à 09:18 -0400, Jesse Noller a écrit :
>> Please make sure he sends in a contributor agreement
>
> I am in contact with Charles-François. I asked me to sign the
> contributor agreement. I told him that it is possible t
Le vendredi 20 mai 2011 à 09:18 -0400, Jesse Noller a écrit :
> Please make sure he sends in a contributor agreement
I am in contact with Charles-François. I asked me to sign the
contributor agreement. I told him that it is possible to scan it and
send the image to the PSF, but he answered that it
Please make sure he sends in a contributor agreement
On Fri, May 20, 2011 at 7:07 AM, Antoine Pitrou wrote:
>
> For the record, and since the devguide commit
> (http://hg.python.org/devguide/rev/0e8e3057d7bc) didn't make it to
> python-checkins (because of
> http://hg.python.org/hooks/rev/aebbd6f
For the record, and since the devguide commit
(http://hg.python.org/devguide/rev/0e8e3057d7bc) didn't make it to
python-checkins (because of
http://hg.python.org/hooks/rev/aebbd6f606f3), I have made
Charles-François a committer after he sent his SSH key.
Regards
Antoine.
Le mercredi 18 mai 201
19 matches
Mail list logo
