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
Hi,
We recently start to use the svn:mergeinfo property for merge tracking instead of svnmerge.py.
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 use svn 1.5.6. Please tell me what to do?
Regards,
________________________________
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
|
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.