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

Problem with svn merge --reintegrate

From: Andreas Tscharner <andreas.tscharner_at_metromec.ch>
Date: Tue, 7 Dec 2010 13:55:00 +0100

Hello World,

I have implemented a feature into our product. To not break things for the other developers, I used a feature branch as described in the svn book. Now my implementation is complete, so I want to merge my branch back to trunk. In a fully updated working copy of the trunk (with no locales changes), I do:

J:\QUARTIS\_dev>svn merge --reintegrate http://srv2.metromec.local:8080/svn/QUARTIS/shelves/ATs/PROGPersistence/_dev --dry-run

which gives me:

Reintegrate can only be used if revisions 13561 through 15007 were previously
merged from http://srv2.metromec.local:8080/svn/QUARTIS/trunk/_dev to the
reintegrate source, but this is not the case:
Missing ranges: /trunk/_dev/src/include/FilterLibrary/Test/TestDataGenerator:13561-15003
Missing ranges: /trunk/_dev/src/include/FilterLibrary/Test/TestFilterLibrary.res:13561-15003
Missing ranges: /trunk/_dev/src/include/FilterLibrary/Test/TestMeasureElementDataInOut.pas:13561-15003
Missing ranges: /trunk/_dev/src/include/FilterLibrary/Test/TestMeasureElementGaussFIRFilter.pas:13561-15003
Missing ranges: /trunk/_dev/src/include/FilterLibrary/Test/TestMeasureElementReducePointsByDistanceFilter.pas:13561-15003

The mentioned files and directories exist in the trunk (and seem to have already existed before the branch was created), but are missing on the branch. I have read in the mailing list archives that a svn merge --record-only (or a corresponding change of the svn:mergeinfo properties) could fix the problem, but how do I find out which revisions are affected (e.g. in which revisions the files and directories were lost)?

TIA and best regards

Freundliche GrĂ¼sse
Wenzel Metromec AG
        Andreas Tscharner
Andreas Tscharner, Development
Wenzel Metromec AG, Rheinfelsstrasse 1, CH-7007 Chur, Switzerland
phone: +41 (0)81 257 07 00
fax: +41 (0)81 257 07 01
e-mail: mailto:andreas.tscharner_at_metromec.ch
www: http://www.metromec.ch
Received on 2010-12-07 13:55:39 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.