I see; since I have not applied any of the changes from trunk this does not apply for what I am doing right now.
Thanks for the explanation. Jody On 27/04/2010, at 11:27 PM, Michael Bedward wrote: >> What does reintegrate do? >> > > From the svn book... > > Notice our use of the --reintegrate option this time around. The > option is critical for reintegrating changes from a branch back into > its original line of development—don't forget it! It's needed because > this sort of “merge back” is a different sort of work than what you've > been doing up until now. Previously, we had been asking svn merge to > grab the “next set” of changes from one line of development (the > trunk) and duplicate them to another (your branch). This is fairly > straightforward, and each time Subversion knows how to pick up where > it left off. In our prior examples, you can see that first it merges > the ranges 345:356 from trunk to branch; later on, it continues by > merging the next contiguously available range, 356:380. When doing the > final sync, it merges the range 380:385. > > When merging your branch back to the trunk, however, the underlying > mathematics is quite different. Your feature branch is now a mishmosh > of both duplicated trunk changes and private branch changes, so > there's no simple contiguous range of revisions to copy over. By > specifying the --reintegrate option, you're asking Subversion to > carefully replicate only those changes unique to your branch. (And in > fact, it does this by comparing the latest trunk tree with the latest > branch tree: the resulting difference is exactly your branch changes!) ------------------------------------------------------------------------------ _______________________________________________ Geotools-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/geotools-devel
