Building Subsurface/libdivecomputer

[Miika Turkia]

On Fri, Jul 24, 2015 at 3:53 PM, Willem Ferguson
<willemferguson at zoology.up.ac.za> wrote:
> I want to ask a silly question on how to build Subsurface. Currently the
> only critical code required is the build.sh script that invokes git to check
> out pull whatever is required. Currently I pull the Subsurface repository to
> get the latest build.sh script. But I am sure there is a much more simple
> way to get hold of the script than invoking the git repository?

what could be easier than git pull? You could also get it from:

http://git.hohndel.org/index.cgi?p=subsurface.git;a=blob_plain;f=scripts/build.sh;hb=HEAD

But I would still claim that git pull is easier.

> Secondly, it appears there may be a problem with the libdivecomputer
> repository?? I get (using Ubuntu 14.04):
> U    src/suunto_eonsteel_parser.c
> M    src/uwatec_smart_parser.c
> Pull is not possible because you have unmerged files.
> Please, fix them up in the work tree, and then use 'git add/rm <file>'
> as appropriate to mark resolution, or use 'git commit -a'.
> error: you need to resolve your current index first
> include/libdivecomputer/shearwater_petrel.h: needs merge
> src/suunto_eonsteel_parser.c: needs merge
> can't check out the Subsurface-testing branch of libdivecomputer -- giving
> up

Just "rm -rf " the whole libdivecomputer sources and start from clean table.

> Is anyone getting a similar error message?

whenever I have had any problems with any of the dependency libs, I
have just nuked the offending lib.

miika