Re: [python-committers] state of repo?

2012-04-06 Thread Georg Brandl
Am 06.04.2012 04:44, schrieb R. David Murray: > I just tried to merge a change from 3.2 to default and found an unexpected > file being merged. Looking at the graph, it *looks* like Sandro copied a > change to default instead of merging it, even though his commit comment > says merge. That would

Re: [python-committers] state of repo?

2012-04-06 Thread Sandro Tosi
On Fri, Apr 6, 2012 at 04:58, Benjamin Peterson wrote: > 2012/4/5 R. David Murray : >> I just tried to merge a change from 3.2 to default and found an unexpected >> file being merged.  Looking at the graph, it *looks* like Sandro copied a >> change to default instead of merging it, even though his

Re: [python-committers] state of repo?

2012-04-06 Thread R. David Murray
On Fri, 06 Apr 2012 09:57:29 +0200, Georg Brandl wrote: > Am 06.04.2012 04:44, schrieb R. David Murray: > > I just tried to merge a change from 3.2 to default and found an unexpected > > file being merged. Looking at the graph, it *looks* like Sandro copied a > > change to default instead of merg