[pony-build] cache_dir stuff under SVN and HG

[C. Titus Brown]

just use a different branch, e.g. nose_problems2.

On Sat, Feb 20, 2010 at 01:08:28PM -0600, Khushboo Shakya wrote:
> Hello Rose,
> 
> I am getting the same error while pushing as I used to get before. I am
> trying to do what Titus told me to do last time: to make a duplicate of my
> file and do the pull but it seems it is not working. Here is the error
> message I am getting when I do the pull:
> 
> Khushboo at KHUSHBOO-PC ~/pony-build/client (master)
> $ git pull git at github.com:kshakya/pony-build.git master
> >From github.com:kshakya/pony-build
>  * branch            master     -> FETCH_HEAD
> CONFLICT (delete/modify): client/pony_client.py deleted in HEAD and mod
> be53b05bdbc775bc8ac89a48bb4a4c52b2fa3861. Version be53b05bdbc775bc8ac89
> 52b2fa3861 of client/pony_client.py left in tree.
> Automatic merge failed; fix conflicts and then commit the result.
> 
> Hope you will be able to help.
> 
> Thanks
> 
> Khushboo
> 
> 
> 
> On Sat, Feb 20, 2010 at 12:48 PM, Rosangela Canino-Koning <
> rosiec at voidptr.net> wrote:
> 
> > I worked through some of the issues with Fatima earlier. The cache_dir
> > problem appears (to me, at least) to be a bug with how -f is trying to force
> > a re-build. Specifically, it doesn't delete the cache directory before
> > starting. If you manually delete the cache directory (which is under your
> > user directory, at ~/.pony_build/<projectname>), and try -f again, it all
> > works.
> >
> > Anyway, I would encourage you to get with Fatima and see if you can get on
> > the same page.
> >
> > -rose
> >
> >
> > On Sat, Feb 20, 2010 at 1:31 PM, Khushboo Shakya <khusuz at gmail.com> wrote:
> >
> >> Hello Rose,
> >>
> >> I got passed the errors but build still fails. I am trying to read the
> >> code to see what I am missing. I can't push my code to the main branch
> >> AGAIN. So I will push it to the nose_problem branch so that you can take a
> >> look at it.
> >>
> >> Thanks again.
> >>
> >> Khushboo
> >>
> >>
> >>
> >> On Sat, Feb 20, 2010 at 10:56 AM, Rosangela Canino-Koning <
> >> voidptr at gmail.com> wrote:
> >>
> >>> Khushboo and Fatima,
> >>>
> >>> How is this going? Made any progress on those errors? I'll be around this
> >>> evening if you guys want to do a Skype chat and work through stuff.
> >>>
> >>> -rose
> >>>
> >>>
> >>> On Wed, Feb 17, 2010 at 6:35 PM, Fatima Cherkaoui <fatizo89 at gmail.com>wrote:
> >>>
> >>>>
> >>>> Thanks Max for your help!
> >>>>
> >>>> The changes translate well into the Hg checkout.
> >>>>
> >>>> The error I'm getting now , is different.
> >>>>
> >>>> http://lyorn.idyll.org/ctb/pb-dev/p/coverage/16572/
> >>>>
> >>>>
> >>>>
> >>>>
> >>>>
> >>>>
> >>>>
> >>>>
> >>>> On Tue, Feb 16, 2010 at 4:38 PM, Max Laite <mlaite at gmail.com> wrote:
> >>>>
> >>>>> Mostly aimed at Khushboo and Fatima....
> >>>>>
> >>>>> Are you guys still planning to do the implementations for handling the
> >>>>> cache_dir stuff under hg/SVN ? If you are, let me know if you have any
> >>>>> questions.
> >>>>>
> >>>>>
> >>>>> See the following for the final working version of the GitClone stuff.
> >>>>>
> >>>>>
> >>>>> http://github.com/mlaite/pony-build/blob/mkdir/client/pony_client.py#L346
> >>>>>
> >>>>> The actual changes/new stuff are between following line(s):
> >>>>>
> >>>>> 389
> >>>>> 379-386
> >>>>> 405-412
> >>>>> 417-420
> >>>>>
> >>>>> Hopefully those changes will translate fairly well over to the other
> >>>>> two.
> >>>>>
> >>>>>
> >>>>> Max
> >>>>>
> >>>>> _______________________________________________
> >>>>> pony-build mailing list
> >>>>> pony-build at lists.idyll.org
> >>>>> http://lists.idyll.org/listinfo/pony-build
> >>>>>
> >>>>>
> >>>>
> >>>>
> >>>> --
> >>>>
> >>>> Fatima-Zohra Cherkaoui
> >>>> Minnesota State University,Mankato
> >>>>
> >>>> _______________________________________________
> >>>> pony-build mailing list
> >>>> pony-build at lists.idyll.org
> >>>> http://lists.idyll.org/listinfo/pony-build
> >>>>
> >>>>
> >>>
> >>
> >

> _______________________________________________
> pony-build mailing list
> pony-build at lists.idyll.org
> http://lists.idyll.org/listinfo/pony-build


-- 
C. Titus Brown, ctb at msu.edu