[Tilesathome] Latest svn (5821)

[Matthias Julius]

<milenko at king-nerd.com> writes:

> Oops - scratch that.  Looks like something happened when svn updated the file.  Here's what I was seeing:
>
> <<<<<<< .mine
>     my $Cmd = sprintf("%s \"%s\" tr --maxdepth 20000 %s %s > \"%s\"",
>       $Config{Niceness},
>       $Config{XmlStarlet},
> =======
>     my $Cmd = sprintf("%s \"%s\" tr --maxdepth %s %s %s > \"%s\"",
>       $Config{"Niceness"},
>       $Config{"XmlStarlet"},
>       $Config{"XmlStarletMaxDepth"},
>>>>>>>> .r5821

SVN does that when there is a conflict between your edits and the new
rev in the repository. 'svn status' should show that. There should
then also be files named tilesGen.pl.mine and tilesGen.pl.r5821 which
are your and the repository's version of the file. To resolve that
copy tilesGen.pl.r5821 to tilesGen.pl and execute 'svn resolved
tilesGen.pl'.

And, you don't need that change anymore. XmlStarletMaxDepth is now a
configuration option in tilesAtHome.conf

Matthias