CODEWITHSUNDEEP
eclipsesvnmergesubversivesynchronize
Dylan
Dylan

Reputation: 9373

SVN: Synchronize branch with trunk in Eclipse?

I have an SVN branch and a trunk. The trunk changes regularly and the branch doesn't.

Every now and then (let's say once per week) I want to update the local working copy of the branch with the latest changes of the trunk.

Ideally I would want to do this the same way as I do it with the latest version of the branch: with Eclipse : Team->Synchronize, so I can review all changes before updating.

Is this also possible with a different repository (for example : trunk) ? If not, how do people review the changes before updating then??

I looked at Team->Merge, but this seems to update the changes directly to my working copy, without the possibility to review the changes first (the Preview-function is confusing, I think, and doesn't provide the nice side-by-side view of changes/conflicts that Synchronize has).

Upvotes: 5

Views: 9880

Answers (3)

benez
benez

Reputation: 2001

I agree that it is not really intuitive by design, but Mark is right, you "synchronize" your changes when committing them back to the trunk:

  • first make sure your local branch is completely synchronized with your repository branch (no changes)
  • Team -> Merge... your local copy of the branch with the repository trunk
  • you now have a local version of that merge
  • you can locally edit this version, make sure tests are working and there are no compiler errors
  • finally you synchronize your local merged branch version with the repository branch and commit all changes that have been made

besides, the same way you'll merge your branch back into the repository trunk

  • make sure all changes of your branch are committed to the repository branch
  • switch to the trunk Team -> Switch...
  • merge your trunk with your branch Team -> Merge... (Tab 'Reintegrate')
  • you now have a local version of the merge, you may edit the changes and review them, make sure that you have a working version now
  • synchronize your local trunk (merged version) with the repository trunk
  • commit all changes that you want to appear in the trunk

i recommend to commit all changes that you've made locally to your merge, since you've tested them locally. if you commit just a few changes, make sure the repository version is still working then with missing changes

Upvotes: 0

Mark Phippard
Mark Phippard

Reputation: 10419

The right way to do this is with Merge. Subclipse includes a merge client that makes this easy to do. You are right that it does not give you a true preview, but the way it works is better from a Subversion perspective. The Merge Results view UI is basically the same as the Synchronize view. It lets you easily examine every change that the merge made in your working copy and the Eclipse compare editor that it opens makes it very easy to take out any parts of the change that you do not want in your code before you commit.

The problem with trying to do this from the Synchronize view is that you are then doing the merge yourself using code editors and Subversion has no awareness of what is merged. If you let Subversion first do the merge, then it can update all of its metadata properly and it is perfectly fine for you to then fixup the code to be the way you want it before you commit the results of the merge.

Upvotes: 6

omnomnom
omnomnom

Reputation: 9139

I'd checkout both branch and trunk as a separate eclipse projects into workspace. Then use some merging tool, for example meld to merge changes between them. After merge you can refresh branch in Eclipse and synchronize it with svn repository - now you can review all changes. (it's how I do it, since I do not believe svn eclipse plugin ;))

Upvotes: 0

Related Questions