This week's book giveaway is in the Clojure forum.
We're giving away four copies of Clojure in Action and have Amit Rathore and Francis Avila on-line!
See this thread for details.
Win a copy of Clojure in Action this week in the Clojure forum!
  • Post Reply
  • Bookmark Topic Watch Topic
  • New Topic

updated to version in subclipse = replace, not mrege?

 
peter tong
Ranch Hand
Posts: 245
  • 0
  • Mark post as helpful
  • send pies
  • 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]
 
Tim Holloway
Saloon Keeper
Pie
Posts: 17624
39
Android Eclipse IDE Linux
  • 0
  • Mark post as helpful
  • send pies
  • 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.
 
I agree. Here's the link: http://aspose.com/file-tools
  • Post Reply
  • Bookmark Topic Watch Topic
  • New Topic