> 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/PROGPersist > ence/_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: > shelves/ATs/PROGPersistence/_dev/src/include/FilterLibrary/Test/Tes > tDataGenerator > Missing ranges: > /trunk/_dev/src/include/FilterLibrary/Test/TestDataGenerator:13561- > 15003 > shelves/ATs/PROGPersistence/_dev/src/include/FilterLibrary/Test/Tes > tFilterLibrary.res > Missing ranges: > /trunk/_dev/src/include/FilterLibrary/Test/TestFilterLibrary.res:13 > 561-15003 > shelves/ATs/PROGPersistence/_dev/src/include/FilterLibrary/Test/Tes > tMeasureElementDataInOut.pas > Missing ranges: > /trunk/_dev/src/include/FilterLibrary/Test/TestMeasureElementDataIn > Out.pas:13561-15003 > shelves/ATs/PROGPersistence/_dev/src/include/FilterLibrary/Test/Tes > tMeasureElementGaussFIRFilter.pas > Missing ranges: > /trunk/_dev/src/include/FilterLibrary/Test/TestMeasureElementGaussF > IRFilter.pas:13561-15003 > shelves/ATs/PROGPersistence/_dev/src/include/FilterLibrary/Test/Tes > tMeasureElementReducePointsByDistanceFilter.pas > Missing ranges: > /trunk/_dev/src/include/FilterLibrary/Test/TestMeasureElementReduce > PointsByDistanceFilter.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)? >
Do you have a sparse checkout by any chance? Are you merging in at the same folder level from where you branched? BOb
