On Mon, Jul 7, 2014 at 3:12 PM, Charles R Harris
wrote:
> On Mon, Jul 7, 2014 at 6:46 AM, Julian Taylor
> wrote:
>>
>> On Mon, Jul 7, 2014 at 2:34 PM, Charles R Harris
>> wrote:
>> > On Mon, Jul 7, 2014 at 2:02 AM, Julian Taylor
>> > wrote:
>> >>
>> >> On 07.07.2014 07:53, Charles R Harris wrot
On 7 Jul 2014 14:12, "Charles R Harris" wrote:.
>
> Yes, what I did was like one big cherry-pick. But I think we end up in
the same place with two divergent branches. I think git history is just a
string of changesets and each changeset has a hash. Same hash, same
changeset, and I think that was p
On Mon, Jul 7, 2014 at 6:46 AM, Julian Taylor wrote:
> On Mon, Jul 7, 2014 at 2:34 PM, Charles R Harris
> wrote:
> > On Mon, Jul 7, 2014 at 2:02 AM, Julian Taylor
> > wrote:
> >>
> >> On 07.07.2014 07:53, Charles R Harris wrote:
> >> > Just so. The fixes for 1.9.0b1 are now in that branch ready
On Mon, Jul 7, 2014 at 2:34 PM, Charles R Harris
wrote:
> On Mon, Jul 7, 2014 at 2:02 AM, Julian Taylor
> wrote:
>>
>> On 07.07.2014 07:53, Charles R Harris wrote:
>> > Just so. The fixes for 1.9.0b1 are now in that branch ready for the next
>> > beta.
>> >
>>
>> how did you do that without a mer
On Mon, Jul 7, 2014 at 2:02 AM, Julian Taylor wrote:
> On 07.07.2014 07:53, Charles R Harris wrote:
> > Just so. The fixes for 1.9.0b1 are now in that branch ready for the next
> > beta.
> >
>
> how did you do that without a merge commit?
>
git branch tmp maintenance/1.9.x
git co tmp
git b
On 07.07.2014 10:02, Julian Taylor wrote:
> On 07.07.2014 07:53, Charles R Harris wrote:
>> Just so. The fixes for 1.9.0b1 are now in that branch ready for the next
>> beta.
>>
>
> how did you do that without a merge commit?
> however you did it you have git has lost ancestry which is not so nice
On 07.07.2014 07:53, Charles R Harris wrote:
> Just so. The fixes for 1.9.0b1 are now in that branch ready for the next
> beta.
>
how did you do that without a merge commit?
however you did it you have git has lost ancestry which is not so nice
for backporting.
If there are no objections I'd like
Just so. The fixes for 1.9.0b1 are now in that branch ready for the next
beta.
Chuck
___
NumPy-Discussion mailing list
NumPy-Discussion@scipy.org
http://mail.scipy.org/mailman/listinfo/numpy-discussion
