Re: [Quantlib-dev] Adding new functions to blackcalculator

[Dima <dim...@go...>]

I see, thanks. Will get back to you

2010/3/3 Luigi Ballabio <lui...@gm...>

> On Wed, 2010-03-03 at 09:47 +0100, Dima wrote:
> > Thanks Luigi and sorry for not having answered earlier. I'm busy. I
> > tried to build QL from the latest trunk
> > but was not sucessfull. And the stuff you added is not in the official
> > 1.0 version, so I couldn't really check.
> > Don't know what happened to the trunk files, they seem to be
> > corrupted. For example, in smilesection.hpp
> > I find
> >
> > <<<<<<<<<<.mine
> >
> > in the code. Its either a problem here or in the trunk.
>
> The trunk is clean.  You modified the code on your machine, made a svn
> update, and got a conflict between your local changes and the changes
> pulled in by the update. Subversion doesn't know how to merge them and
> keeps both sets of changes between markers such as the one above. You'll
> have to resolve the conflict manually. You can see
> <
> http://svnbook.red-bean.com/en/1.5/svn.tour.cycle.html#svn.tour.cycle.resolve>
> for more details.
>
> Luigi
>
>
> --
>
> The box said "Use Windows 95 or better," so I got a Macintosh.
>
>
>