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

Reinhard Kotucha reinhard.kotucha at web.de
Wed Feb 13 01:57:31 CET 2008

Zdenek Wagner writes:
 >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. [...]  "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". [...]

Yes, the file should be removed, of course.  And then the whole tree
has to be updated because it doesn't make any sense to have a recent
ls-R file and an ancient texmf-dist tree.


Reinhard Kotucha			              Phone: +49-511-4592165
Marschnerstr. 25
D-30167 Hannover	                      mailto:reinhard.kotucha at web.de
Microsoft isn't the answer. Microsoft is the question, and the answer is NO.

More information about the tex-live mailing list