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

Merge Reponse error resulted in wrong commit!

From: Peeters, Piet-Hein <piet-hein.peeters_at_philips.com>
Date: Fri, 6 Mar 2009 16:55:12 +0100


We recently start to use the svn:mergeinfo property for merge tracking instead of svnmerge.py.
Today I merged a revision range from /branches/pii81 to a working copy of trunk.

When I wanted to commit the changeset I got the following error:

svn: Commit failed (details follow):

svn: A MERGE response for '/svn/mip/branches/pii81/software/PMX/ADE/Philips/PmsMip/Private/Viewing/Documents/Transformers/DocumentTransformerBase.cs' is not a child of the destination ('/svn/mip/trunk')

Instead of a failing commit, the commit resulted in a new revision on trunk, but the file mentioned in the error message was committed on the source branch!!
I cannot commit the file (which has a only a change on the svn:mergeinfo property) to trunk. Subversion keeps telling me it is out of date (which is not true).

I use svn 1.5.6. Please tell me what to do?

Piet-Hein Peeters

The information contained in this message may be confidential and legally protected under applicable law. The message is intended solely for the addressee(s). If you are not the intended recipient, you are hereby notified that any use, forwarding, dissemination, or reproduction of this message is strictly prohibited and may be unlawful. If you are not the intended recipient, please contact the sender by return e-mail and destroy all copies of the original message.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-06 16:56:26 CET

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

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