[tex-live] broken ls-R file in rev 6591

[Zdenek Wagner]

2008/2/12, Reinhard Kotucha <reinhard.kotucha at web.de>:
> Werner LEMBERG writes:
>  >
>  > The file texmf-dist/ls-R in rev 6591 contains `<<<<<<<' and `>>>>>>>'.
>
> Hi Werner,
> this is what subversion inserts if it encounters a conflict.  It
> should be sufficient to run "svn update" again.  rev 6614 looks fine.
>
I am not sure that this helps. First, if you run "svn status", you
will see "C" in front of the file name. The reason of the conflict is
that you made (either intentionally or by mistake) local changes to
texmf-dist/ls-R ant they overlap changes made in the repository so
that they cannot be merged together. "svn update" will most probably
still leave the file in conflict because you still have your
incompatible local changes. I would suggest first deleting ls-R and
then running "svn update". If should inform you that a lost file is
being refreshed and hopefully will solve the conflict condition.

> Regards,
>   Reinhard


-- 
Zdeněk Wagner
http://hroch486.icpf.cas.cz/wagner/
http://icebearsoft.euweb.cz