• Post Reply Bookmark Topic Watch Topic
  • New Topic
programming forums Java Mobile Certification Databases Caching Books Engineering Micro Controllers OS Languages Paradigms IDEs Build Tools Frameworks Application Servers Open Source This Site Careers Other Pie Elite all forums
this forum made possible by our volunteer staff, including ...
Marshals:
  • Campbell Ritchie
  • Jeanne Boyarsky
  • Ron McLeod
  • Paul Clapham
  • Liutauras Vilda
Sheriffs:
  • paul wheaton
  • Rob Spoor
  • Devaka Cooray
Saloon Keepers:
  • Stephan van Hulst
  • Tim Holloway
  • Carey Brown
  • Frits Walraven
  • Tim Moores
Bartenders:
  • Mikalai Zaikin

updated to version in subclipse = replace, not mrege?

 
Ranch Hand
Posts: 308
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
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?
svnUpdateToVersion1.jpg
[Thumbnail for svnUpdateToVersion1.jpg]
 
Saloon Keeper
Posts: 27762
196
Android Eclipse IDE Tomcat Server Redhat Java Linux
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
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.
 
Don't get me started about those stupid light bulbs.
reply
    Bookmark Topic Watch Topic
  • New Topic