Re: [matplotlib-devel] github pull requests: odd listings of hundreds of commits

2011-05-18 Thread Eric Firing
On 05/18/2011 11:45 AM, Darren Dale wrote: >> >> I suspect the anomalies have not resulted from forced pushes, but from >> local pulls and merges followed by innocuous pushes. So the key is >> understanding how to ensure one's local branches have the desired >> history before pushing to github.

Re: [matplotlib-devel] github pull requests: odd listings of hundreds of commits

2011-05-18 Thread Darren Dale
On Wed, May 18, 2011 at 3:22 PM, Eric Firing wrote: > On 05/18/2011 08:47 AM, Benjamin Root wrote: >> >> >> On Tue, May 17, 2011 at 9:07 PM, Gerald Storer > > wrote: >> >>     On 18/05/2011 5:14 AM, Eric Firing wrote: >>      > 3) We don't have to always push sets of ch

Re: [matplotlib-devel] github pull requests: odd listings of hundreds of commits

2011-05-18 Thread Eric Firing
On 05/18/2011 08:47 AM, Benjamin Root wrote: > > > On Tue, May 17, 2011 at 9:07 PM, Gerald Storer > wrote: > > On 18/05/2011 5:14 AM, Eric Firing wrote: > > 3) We don't have to always push sets of changes from an original pull > > request to upstream; they

Re: [matplotlib-devel] github pull requests: odd listings of hundreds of commits

2011-05-18 Thread Pauli Virtanen
On Wed, 18 May 2011 13:47:04 -0500, Benjamin Root wrote: [clip] > Don't know if this was a mistake or not, but I see that commit e7f1e83 > (the one to fix a clipping issue when a patch's line width is 1 but > there is no color) seems to have been merged back into itself... > somehow... in commit 0c

Re: [matplotlib-devel] github pull requests: odd listings of hundreds of commits

2011-05-18 Thread Benjamin Root
On Tue, May 17, 2011 at 9:07 PM, Gerald Storer wrote: > On 18/05/2011 5:14 AM, Eric Firing wrote: > > 3) We don't have to always push sets of changes from an original pull > > request to upstream; they can be consolidated using any of a variety of > > methods to form a new local feature branch wi

Re: [matplotlib-devel] github pull requests: odd listings of hundreds of commits

2011-05-17 Thread Gerald Storer
On 18/05/2011 5:14 AM, Eric Firing wrote: > 3) We don't have to always push sets of changes from an original pull > request to upstream; they can be consolidated using any of a variety of > methods to form a new local feature branch with the same net effect but > fewer commits (maybe only one), and

Re: [matplotlib-devel] github pull requests: odd listings of hundreds of commits

2011-05-17 Thread Pauli Virtanen
On Tue, 17 May 2011 16:14:53 -0400, Michael Droettboom wrote: > Darned if I know what I did differently that time. (I'm sure I hit > git's "misunderstanding" feature again). > > It only seems to have affected 2 or 3 of the pull requests -- I suspect > rebasing those branches off of the current ma

Re: [matplotlib-devel] github pull requests: odd listings of hundreds of commits

2011-05-17 Thread Eric Firing
On 05/17/2011 10:14 AM, Michael Droettboom wrote: > Darned if I know what I did differently that time. (I'm sure I hit > git's "misunderstanding" feature again). > > It only seems to have affected 2 or 3 of the pull requests -- I suspect > rebasing those branches off of the current master would fi

Re: [matplotlib-devel] github pull requests: odd listings of hundreds of commits

2011-05-17 Thread Michael Droettboom
Darned if I know what I did differently that time. (I'm sure I hit git's "misunderstanding" feature again). It only seems to have affected 2 or 3 of the pull requests -- I suspect rebasing those branches off of the current master would fix the problem, but maybe there's an easier way. Mike O

[matplotlib-devel] github pull requests: odd listings of hundreds of commits

2011-05-17 Thread Eric Firing
I suspect that the series of May 6 commits ending with a50874b711983cba505ecdb2801c4996eccf3812 has tangled the history in such a way that some (but not all) older pull requests on github like this one https://github.com/matplotlib/matplotlib/pull/1 are showing hundreds of commits and diffs. E