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

mismatched merges

From: Hoefakker, Paul <PHoefakker_at_inconso.de>
Date: Wed, 8 Feb 2012 10:45:56 +0000


We are using:
SVN client 1.6.13 on windows
SVN server 1.6.12 as server

We are looking for a solution of next issue:
If we make a selective merge from our trunk to a subbranch and changes are made on the end of a file also changes which were not made in the selected revision range are taken over. (All changes on the end of file are taken over).

Is this a known issue and is there a possibility to prevent this? In our case in trunk some new functions where created at the end of a C++module file. After a while a new function to resolve a bug was added at the end. In the merge only the last change (bug solution) was selected. In the branches where the merge was made also the other functions where merged.

With best regards / Mit freundlichen Grüßen,

P. G. Hoefakker
Consultant / Berater

inconso AG
Speicher 1
Konsul-Smidt-Str. 8j
28217 Bremen
Tel: +49 421 20762-2377
Fax: +49 421 20762130

28. - 29.02.2012
        SAP EWM - der leistungsstarke Standard für die Lagerverwaltung
Besuchen Sie den inconso Workshop in Bad Schönborn und Hannover
Weitere Informationen unter http://www.inconso.de/events
inconso AG
Dieselstr. 1 - 7
61231 Bad Nauheim
Tel: +49 6032 348-0
Fax: +49 6032 348-100
Bertram Salzinger (Vors.)
Thomas Gries
Wilfried Pfuhl
Dr. Gerd Wintermeyer Aufsichtsratsvorsitzender
Prof. Dr. Dr. h.c. (MEX)
Joachim Berendt Amtsgericht Friedberg
HRB 5632 Finanzamt Gießen
Received on 2012-02-08 11:58:40 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.