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

Re: [Subclipse-users] need conflicts editor for Team/Merge function

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-10-20 14:42:06 CEST

"lixueming" <xueming.li@obroadband.com> wrote on 10/20/2006 02:50:23 AM:

> Merge function provide DryRun/DiffToFile, but for most cases,
> I have to preview the conflicts and changeds, choose the changes
> need to be merged.
>
> maybe I can switch to start version and use Compare Editor to choose
> changes and save them to a patch file, then switch back, apply the
patch.
>
> I was familier with the cvs merge editor, so .... is it possible?

SVN merge is different than CVS. You can use the dry-run option to get a
general idea of what is going to happen, but then you need to run the
merge and let Subversion merge everything into your working copy. It will
generate conflicts in your working copy for anything it could not
auto-merge and you can then do Team -> Edit Conflicts to manually resolve
the conflict using a conflict editor. You can do Compare with -> Base
revision if you just want to get a general picture of what the merge did,
and you can do Team -> Revert to undo what the merge did. You could do
this on the whole project or select files.

Conflicts shows as decorators on the files and also as markers in the
Problems view. There are Quick Fix options on the markers to manage the
conflicts.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Fri Oct 20 14:42:16 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.