Re: [Paparazzi-devel] make error in the very latest build

[Kirk Scheper]

You don't necessarily need a fresh install, you can first try to 
checkout a new branch from master. e.g.

git remote update -p
git checkout -b new_branch_name origin/master
make clean && make

Kirk

On 23/10/17 16:40, Chris Efstathiou wrote:
> Hi.
>
> I will try tomorrow a new inställ and report back.
>
>  I hanen't changed anything though, it is just an older master updated 
> through git pull 3 or 4 times.
>
> Also it is an .ml file so i definitely didn't messed with files of 
> that type.
>
> Chris.
>
>
> On 10/23/2017 2:15 PM, Kirk Scheper wrote:
> > Hey Hendrix,
> > I get no errors building a clean version of the current master. The 
> > error is likely due to some of your local changes.
> >
> > You can see your changes in a useful graphical way with (if your 
> > remote for paparazzi is called origin):
> >
> >     git difftool -d origin/master
> >
> > This will show you each file that is different from master. When you 
> > select a file it will show you each line that is different.
> >
> > Kirk
> >
> > On 23/10/17 13:09, Chris wrote:
> > > Hi
> > >
> > > I tried to refresh my master version and after a git pull and a make 
> > > clean i get this error when i am trying to compile the new code
> > >
> > > File "quaternion.ml", line 44, characters 2-167:
> > > Error: The record field label y belongs to the type euler_angle
> > >        but is mixed here with labels of type quaternion
> > > make[1]: *** [quaternion.cmo] Error 2
> > > make: *** [libpprz] Error 2
> > > address@hidden:~/paparazzi$
> > >
> > > This is the output of the git branch -vv command
> > >
> > > address@hidden:~/paparazzi$ git branch -vv
> > > * master 7bbb52a [upstream/master] Fixed the EdgeFlow Divergence 
> > > computation Sign Error (#2096)
> > > address@hidden:~/paparazzi$
> > >
> > > Chris
> > >
> > >
> > > _______________________________________________
> > > Paparazzi-devel mailing list
> > > address@hidden
> > > https://lists.nongnu.org/mailman/listinfo/paparazzi-devel
> >
> >
> > _______________________________________________
> > Paparazzi-devel mailing list
> > address@hidden
> > https://lists.nongnu.org/mailman/listinfo/paparazzi-devel
>
>
> ---
> This email has been checked for viruses by Avast antivirus software.
> https://www.avast.com/antivirus
>
>
> _______________________________________________
> Paparazzi-devel mailing list
> address@hidden
> https://lists.nongnu.org/mailman/listinfo/paparazzi-devel