[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: merge issue - 1.1.1 client, 1.0.8 server

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2004-11-21 07:27:57 CET

Robert Spier <rspier@pobox.com> writes:

> I think I might have a 1.0/1.1 compatibility issue.

Nope, you just have a control character in a log message. So, the
REPORT you are seeing fail is the same kind used by 'svn log'. In
fact, you can reproduce this error by simply running

   $ svn log -r1541 http://your.server.com

Neon debugging output shows this:

   <?xml version="1.0" encoding="utf-8"?>
   <S:log-report xmlns:S="svn:" xmlns:D="DAV:">
   <S:log-item>
   <D:version-name>1541</D:version-name>
   <D:creator-displayname>wheeler</D:creator-displayname>
   <S:date>2002-09-11T02:54:05.000000Z</S:date>
   <D:comment>Merge from Release_1_4_0. That branch has now been tagged OB
   "Release_1_4_0_merge-2002-09-10".
   </D:comment>
   </S:log-item>
   </S:log-report>

See that character after "has now been tagged" ? I think that's the
sucker that's causing you problems. Use 'svnadmin setlog' to fix that
sucker, and I think you'll be all good (I've checked all other
existing revisions in your repository).

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Nov 21 07:31:39 2004

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.