[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [Subclipse-users] Choosing which version to take during an interbranch merge...

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-02-18 17:05:38 CET

> I recently did an interbranch merge which turned up around 65 conflicts.
> Most of the time I knew that I wanted to accept the incoming version
> needing to "Edit conflicts".

The Synch view is an easy place to get confused. This is because the view
itself has its notion of a conflict (incoming and outgoing change of same
resource) and Subversion has its notion of a conflict (updated local file
that has unmergeable changes). The Subversion conflicts do not exist until
after you have done an Update/Merge. The Synch view conflicts exist before
you have done the update as a notification/alert mechanism. Note that
there is no analysis of the change that takes place here. If there is an
incoming/outgoing change it is called a conflict. There is no check as to
whether the incoming change could be auto-merged of an update was done.

> Is it possible to add "Keep local version" ,"Accept incoming version" and
> "Edit conflicts" to the right click menu in the "Team Synchronize" view?

The Override and Update option exists to indicate that you want to take the
incoming version. Edit Conflicts exists to resolve Subversion conflicts.
So it cannot exist as an option until after you have done an Update and a
Subversion conflict was created. Generally, if you want the local changes
you can just do an Update. If Subversion cannot auto-merge the file then a
conflict will be produced. You can either take the Edit Conflicts action
or use the Quick Fix option from the Problems view to take "your" version
or "their" version.

> I also have a couple of related questions... The default double click
> for a file with conflicts is "Compare Editor" and not "Edit conflicts".
> this expected?

The Compare Editor is what you use if you want to resolve the conflict
BEFORE doing an update. Once you have merged the change manually, you take
the Mark As Merged option which will remove the conflict and likely change
it to an outgoing change. The Edit Conflicts action exists to resolve a
Subversion conflict, which does not happen until AFTER you do an update and
Subversion cannot auto-merge the change, putting the status in a CONFLICTED


Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.

To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Sat Feb 18 17:05:56 2006

This is an archived mail posted to the Subclipse Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.