Hi there,
We have another problem with branching and merging!
Our scenario: we have one integration line (BRANCHES/A) where the results of
different feature branches (e.g. BRANCHES/B, BRANCHES/C) should be merged.
Thus, one developer (B) creates a feature branch, does his work, does some
sync merges (r1763), and finally two reintegration merges (r1767, r1769).
Now a second developer (C) takes the result (r1770) and creates his own
feature branch (C). He also does some sync merges and some reintegration
merges.
So far, everything is working well.
1778 1779 1784 1799
| | | |
-------+-----+--------+-----+-------------
BRANCHES/C
1757 1760 1768 1770 / 1775 / \ 1780 / \ 1800 1805
| | | |/ |/ \| / \| |
------||--+----||-----+-----+------+-----------+--+-----------+----------
BRANCHES/A
\ \ / / \
\ \ / / \
-||-----+-----+-----+--------------------------------------!!!
BRANCHES/B
| | |
1763 1767 1769
But now, the first developer (B) likes to continue his work and tries to
merge the changes from the integration line.
Here he gets the error E195016:
wc/B/$ svn merge --verbose ^/BRANCHES/A
--- Merging
svn: E195016: Reintegrate can only be used if revisions 1758 through 1805
were previously merged from https://host/project/BRANCHES/B to the
reintegrate source, but this is not the case:
BRANCHES/A
Missing ranges: /BRANCHES/A:1760,1764,1768,1770,1775,1780,1800
wc/B/$ svn mergeinfo ^/BRANCHES/A
youngest common ancestor
| last full merge
| | tip of branch
| | | repository path
1757 1805
| |
-------| |------------ BRANCHES/A
\ /
\ /
--| |------------ BRANCHES/B
| |
1769 1801
For your information:
* previously merges: svn V1.8.2
* now we use svn V1.8.5
* Server: VisualSVN with svn V1.6.2 (r37639)
What can we do to resolve these problems?
What can we do to prevent this problem in future?
Yours sincerely
Friedbert Widmann
--
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:[email protected]
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.
