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

MERGE: request failed on '/path/to/file'

From: Victor Gumayunov <gumayunov_at_gmail.com>
Date: 2006-09-28 12:02:48 CEST


We recently moved to svn 1.4 server and client.
And got into the following trouble.

When one commits any change to server, it always returns this error:

MERGE: request failed on '/path/to/file'
MERGE: of '/path/to/file': 200 ok (http://svn)

The respository is really updated, but local files doesn't reflect that.

So that if one runs "svn update" at this moment, everything becomes ok
(it updates local .svn/files)
but without this "svn update" the next commit leads to conflicts
(as it tries to commit changes that were already merged into
repository during the 1st commit).

FreeBSD 5.5-RELEASE-p1 #4: Fri Jun 2 12:23:54 MSD 2006
svn, version 1.4.0 (r21228)

        libsvn_client-1.so.0 => /usr/local/lib/libsvn_client-1.so.0
        libsvn_wc-1.so.0 => /usr/local/lib/libsvn_wc-1.so.0 (0x280b0000)
        libsvn_ra-1.so.0 => /usr/local/lib/libsvn_ra-1.so.0 (0x280d9000)
        libsvn_diff-1.so.0 => /usr/local/lib/libsvn_diff-1.so.0 (0x280dd000)
        libsvn_ra_local-1.so.0 => /usr/local/lib/libsvn_ra_local-1.so.0
        libsvn_repos-1.so.0 => /usr/local/lib/libsvn_repos-1.so.0
        libsvn_fs-1.so.0 => /usr/local/lib/libsvn_fs-1.so.0 (0x28106000)
        libsvn_fs_fs-1.so.0 => /usr/local/lib/libsvn_fs_fs-1.so.0
        libsvn_ra_svn-1.so.0 => /usr/local/lib/libsvn_ra_svn-1.so.0
        libsvn_ra_dav-1.so.0 => /usr/local/lib/libsvn_ra_dav-1.so.0
        libsvn_delta-1.so.0 => /usr/local/lib/libsvn_delta-1.so.0
        libsvn_subr-1.so.0 => /usr/local/lib/libsvn_subr-1.so.0 (0x28152000)
        libaprutil-1.so.2 => /usr/local/lib/libaprutil-1.so.2 (0x2817c000)
        libapr-1.so.2 => /usr/local/lib/libapr-1.so.2 (0x28190000)
        libpthread.so.1 => /usr/lib/libpthread.so.1 (0x281b0000)
        libneon.so.25 => /usr/local/lib/libneon.so.25 (0x281d4000)
        libssl.so.4 => /usr/local/lib/libssl.so.4 (0x281ee000)
        libgssapi.so.7 => /usr/lib/libgssapi.so.7 (0x28228000)
        libkrb5.so.7 => /usr/lib/libkrb5.so.7 (0x28236000)
        libasn1.so.7 => /usr/lib/libasn1.so.7 (0x2826e000)
        libcrypto.so.4 => /usr/local/lib/libcrypto.so.4 (0x2828f000)
        libroken.so.7 => /usr/lib/libroken.so.7 (0x283a4000)
        libcrypt.so.2 => /lib/libcrypt.so.2 (0x283b2000)
        libcom_err.so.2 => /usr/lib/libcom_err.so.2 (0x283ca000)
        libexpat.so.6 => /usr/local/lib/libexpat.so.6 (0x283cc000)
        libintl.so.6 => /usr/local/lib/libintl.so.6 (0x283ed000)
        libiconv.so.3 => /usr/local/lib/libiconv.so.3 (0x283f6000)
        libz.so.2 => /lib/libz.so.2 (0x284e3000)
        libc.so.5 => /lib/libc.so.5 (0x284f3000)
Received on Fri Sep 29 05:29:22 2006

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