[Python-checkins] r75107 - python/branches/py3k/Objects/obmalloc.c

[Kristján Valur Jónsson]

Sure.  I had no idea that svn didn't track merges on its own accord like Perforce does.  I've been using tortoisesvn on its own since I started contributing.
K

> -----Original Message-----
> From: python-checkins-bounces+kristjan=ccpgames.com at python.org
> [mailto:python-checkins-bounces+kristjan=ccpgames.com at python.org] On
> Behalf Of Mark Dickinson
> Sent: 28. september 2009 16:04
> To: kristjan.jonsson
> Subject: Re: [Python-checkins] r75107 -
> python/branches/py3k/Objects/obmalloc.c
> 
> On Mon, Sep 28, 2009 at 4:58 PM, kristjan.jonsson
> <python-checkins at python.org> wrote:
> > Author: kristjan.jonsson
> > Date: Mon Sep 28 17:57:53 2009
> > New Revision: 75107
> >
> > Log:
> > merging revision 75106 from trunk:
> > [...]
> 
> Kristján, in future, please could you use svnmerge when merging from
> trunk to py3k
> (or from trunk to release26-maint, or from py3k to release31-maint).
> I've fixed these
> recent checkins (75103, 75104, 75106).
> 
> Thanks,
> 
> Mark
> _______________________________________________
> Python-checkins mailing list
> Python-checkins at python.org
> http://mail.python.org/mailman/listinfo/python-checkins