Hello, We are using svnmerge.py and Subversion 1.5.2 for our development. We run into a subversion bug (http://subversion.tigris.org/issues/show_bug.cgi?id=3250) in the following scenario:
2 branches A & B and 1 trunk. Developer 1 starts a merge from branch A to a working copy of trunk. Developer 2 starts a merge from branch B to another working copy of trunk. Developer 1 is satisfied with the merge results and commits Developer 2 is ready after developer 1 committed and need to update his working copy before the commit. During the update developer 2 runs into the following error: svn: In directory 'dir' svn: Error processing command 'append' in 'dir' svn: Missing 'dest' attribute in 'dir' The svnmerge-integrated property seems to be the cause of this error because that property needs to be updated before the commit. Is there a work-around for this problem? Our merges from different branches to trunk are not centralized and should be able to take place at the same time. Regards, Piet-Hein Peeters Software Configuration Manager ---------------------------------------------------------------------------- Philips Healthcare - Healthcare Informatics / PII Room QV-136, P.O. Box 10.000, NL - 5680 DA Best Phone +31 40 27 62016 Fax +31 40 27 62379 ---------------------------------------------------------------------------- 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. _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
