pcp
[Top] [All Lists]

Re: python QA/709 failures

To: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Subject: Re: python QA/709 failures
From: fche@xxxxxxxxxx (Frank Ch. Eigler)
Date: Fri, 12 Apr 2013 09:39:11 -0400
Cc: Stan Cox <scox@xxxxxxxxxx>, pcp@xxxxxxxxxxx
Delivered-to: pcp@xxxxxxxxxxx
In-reply-to: <5167C37D.7040406@xxxxxxxxxxxxxxxx> (Ken McDonell's message of "Fri, 12 Apr 2013 18:19:09 +1000")
References: <1086370001.24034377.1364166803775.JavaMail.root@xxxxxxxxxx> <514F89FC.5020102@xxxxxxxxxxxxxxxx> <515DC99F.6050600@xxxxxxxxxx> <5167C37D.7040406@xxxxxxxxxxxxxxxx>
User-agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux)
Hi, Ken -

kenj wrote:

> I don't want to confuse the upstream merging by cherry-picking from
> your tree, especially if there are python changes beyond the qa ones.

(For what it's worth, git does not get confused about cherry-picking
and a later merging from the same source.)

> What's the plan for getting your changes merged into the official pcp
> tree on oss.sgi.com?

I expect they will be merged very shortly, after Nathan/Stan return.


- FChE

<Prev in Thread] Current Thread [Next in Thread>