[pony-build] Nose build-script problem fixed.

[C. Titus Brown]

On Thu, Feb 25, 2010 at 08:50:27PM -0600, Khushboo Shakya wrote:
> Hello Titus,
> 
> I have removed all the branches and made the changes.My recent push is under
> 
> http://github.com/kshakya/pony-build/tree/master/client/

Hi Khushboo, this got lost in my e-mail -- sorry!

I don't think this branch is mergeable; check out:

  http://github.com/kshakya/pony-build/commits/master/

This is your history of commits, and you can see that after my Feb 24th
commit (d0ef1bc) you only made one commit (49f221644).  If you click on
that, you get

  http://github.com/kshakya/pony-build/commit/49f221644622d31a85a2ecc9cf42fe377201a85e

which shows changes to well over a dozen files -- most of them unrelated
to your nose changes ;).

To get the build-nose client in, I think you should:

 - save the file somewhere else,
 - fetch a fresh copy of my master branch,
 - check out that branch,
 - do a 'git mv' to move client/build-nose.py to client/build-nose
 - copy your saved build-nose file (step #1) over,
 - and commit & push.

cheers,
--titus