Geek Answers Handbook

SVN: Synchronize a branch with a trunk in Eclipse?

I have an SVN branch and trunk. A line changes regularly, but a branch does not.

From time to time (say once a week) I want to update the local working copy of the branch with the latest changes to the trunk.

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

Is this also possible with another repository (ex: trunk)? If not, how do people view changes before upgrading, then?

I looked at Team-> Merge, but it seems to update the changes directly in my working copy, not being able to view the changes first (the Preview function confuses, I think, and does not provide a pleasant lateral view of the changes / conflicts that Synchronize has).

+5
source share
3 answers

Merge. Subclipse , . , , Subversion. "". , , Eclipse, , , , .

Synchronize , , Subversion , . Subversion , , , , , .

+6

, . , meld, . Eclipse svn - . ( , svn eclipse plugin;))

0

, , , "" , :

  • , ( ).
  • → ...
  • , , , .
  • , .

, ,

  • , .
  • Team → Switch...
  • Team → Merge... (Tab 'Reintegrate')
  • , , ,
  • ( )
  • ,

I recommend that you make all the changes that you made locally for your merge, since you tested them locally. if you commit only a few changes, make sure that the version of the repository is still working, and then with the missing changes.

0
source

More articles:


All Articles