>
> Eh somekind of fix ? i deleted everything but the settings
> (.squeezeplay) and did "svn co" again and built it from scratch.
>
> for some reason unknown to me my makefile and probably other thing got
> corrupted down the road somewhere ? there was a lot of <<<<<<< in front
> of the lines in the makefile and it did not look like the one in the svn
> repo.

This indicate a conflict, which would have been also noted when you do svn
up.  Usually you can simply type a key or two in response to resolve them
while you check out (tf, for example uses the SD repo version in full -
"theirs-full").

svn revert also works if you want to simply clean the junk out.

If they are the result of local modifications, then you can fix them by
editing the files with the conflicts.

svn status will show you any current files that have conflicts.

-kdf

_______________________________________________
beta mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/beta

Reply via email to