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

Svnmerge and svn 1.5.4 conflict problem - svn: Error reading spooled REPORT request response

From: Sue Pharoah <Sue.Pharoah_at_aquilauk.co.uk>
Date: Tue, 9 Dec 2008 16:23:50 -0000

Hi,

    We are trying to upgrade to the subversion client 1.5.4 on windows.
However due to limitations and outstanding issues of the new svn merge
functionality we want to continue to use svnmerge.py until these are
addressed.
     
    We are running on windows XP and use the svnmerge.exe wrapper to run
svnmerge.py.

    It all works fine until there is a conflict, when this error occurs:

C:\Eclipse\je68workspace\je68>svnmerge merge -s -S RELEASE-6.7.0
svn merge -r 54419:54420
http://mantistest.hal.co.uk/repos/Administrator/branches/RELEASE-6.7.0 .
svnmerge: command execution failed (exit code: 1)
svn merge -r 54419:54420
http://mantistest.hal.co.uk/repos/Administrator/branches/RELEASE-6.7.0 .
Conflict discovered in
'java/src/aquila/administrator/admingroup/domain/AdminGroup.java'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (h) help for more options: svn: Can't read stdin: End of file
found
svn: Error reading spooled REPORT request response

  There is indeed a conflict, but it is impossible to deal with it as it
is not possible to select the options and the change [ as a conflict ]
never gets written out.

  If I set the SVN_EDITOR e.g. to notepad or wordpad, it makes no
difference - though if I run the same svn merge command without the
svnmerge.py wrapper I am able to select the edit, postpone and diff full
options as well as use the appropriate editor.

   This does not happen with 1.4 client - it simply writes out the
conflicting file with conflict markers.

Any help would be appreciated.

Thanks

Sue Pharoah

Aquila Group Holdings Limited Registered in England No. 3613039. Registered Office: Aquila House 35 London Road Redhill Surrey RH1 1NJ

This email may contain privileged and confidential information and should not be used by anyone who is not the original
intended recipient(s). Any other distribution, use or reproduction without the sender's prior consent is unauthorised and
strictly prohibited.
If you have received this email in error, please notify the sender immediately by email and delete all copies of the
message from your system.

Please consider the environment and don't print this e-mail unless you really need to.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=981728
Received on 2008-12-09 17:32:56 CET

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