svn V1.8.5: E195016: Reintegrate can only be used if revisions 1758 through 1805 were previously merged from
From: Friedbert Widmann <FWidmann_at_csm.de>
Date: Thu, 19 Dec 2013 13:03:23 +0100
We have another problem with branching and merging!
Our scenario: we have one integration line (BRANCHES/A) where the results of
Thus, one developer (B) creates a feature branch, does his work, does some
1778 1779 1784 1799
But now, the first developer (B) likes to continue his work and tries to
wc/B/$ svn mergeinfo ^/BRANCHES/A
For your information:
What can we do to resolve these problems?
What can we do to prevent this problem in future?
-- Software-Engineer SW development CSM GmbH Phone: +49 (0) 711 - 7 79 64-20 Raiffeisenstrasse 34 Fax: +49 (0) 711 - 7 79 64-40 70794 Filderstadt mailto:fwidmann_at_csm.de Germany CSM - Innovative Measuring and Data Technology www.csm-products.com _____________________________________________ CSM Computer-Systeme-Messtechnik GmbH General Managers: Dipl.-Ing. Iris Koch, Dr.-Ing. Winfried Koch VAT Reg. No.: DE 147862865, WEEE-Reg.-Nr.: DE 49418762 Company Location: 70794 Filderstadt, Germany Court of Justice: Amtsgericht Stuttgart Commercial register: HRB 222607 This e-mail may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and delete this e-mail. Any unauthorized copying, disclosure or distribution of the material in this e-mail is strictly forbidden.Received on 2013-12-19 13:52:58 CET
This is an archived mail posted to the Subversion Users mailing list.