aspose file tools*
The moose likes IDEs, Version Control and other tools and the fly likes updated to version in subclipse = replace, not mrege? Big Moose Saloon
  Search | Java FAQ | Recent Topics | Flagged Topics | Hot Topics | Zero Replies
Register / Login
JavaRanch » Java Forums » Engineering » IDEs, Version Control and other tools
Bookmark "updated to version in subclipse = replace, not mrege?" Watch "updated to version in subclipse = replace, not mrege?" New topic
Author

updated to version in subclipse = replace, not mrege?

peter tong
Ranch Hand

Joined: Mar 15, 2008
Posts: 240
from the attachment, the left hand side is the working copy and is newer, the right hand side is the old revision.
if I right click the file and choose team > update to version,
I found the reason is the old revision will replace the working copy, but not merge (updated).
for example:
the contact constructor take two parameters only after update.
and why there is no conflict as the constructor is different in two version?


[Thumbnail for svnUpdateToVersion1.jpg]

Tim Holloway
Saloon Keeper

Joined: Jun 25, 2001
Posts: 16068
    
  21

If you will notice, there are lines drawn around the areas that differ in the side-by-side version comparison pane.

There are also some controls up in the upper right corner of that pane.

One of them will run down the comparisons, highlighting each difference in turn. One will replace the workspace difference with the selected repository difference. Once will do a mass replacement of all non-conflicting differences. Hovering your mouse pointer over each control will display a pop-up tooltip. More detailed help is available from the Eclipse Help facility.


Customer surveys are for companies who didn't pay proper attention to begin with.
 
I agree. Here's the link: http://aspose.com/file-tools
 
subject: updated to version in subclipse = replace, not mrege?