On 7/26/07, Alexander Shatalin <Alexander.Shatalin@borland.com> wrote:
> >> it could use them when showing diffs in the synch view?
> >Subclipse does know about them and does use them. Take the Edit
> Conflicts action. The problem is that we only know about them from the
> context of the file that has the conflicts.
> Can subclipse check if there any "conflicting" files and filter-out
> corresponding extra-files from Synchronized view while asked for
> children of a folder?
It just isn't the way the view works. It is all notification driven.
We get notified by Eclipse that this file exists. We have to figure
out what it is etc...
> >> The svn status on the command line does report the file as a
> conflict,
> >> but subclipse synch view does not.
> >This is a limitation of the Synchronize view. It does not allow for
> the concept of a working copy conflict. It has its own definition of
> conflict that has a different meaning.
> CVS is able to show "Unable to merge conflicts" dialog in this situation
> and leave file in "conflicting" state. It looks sufficient for me.
That is not the same thing as what is happening with Subversion. Also
keep in mind that the interaction of the CVS plug-in and CVS is very
different than what we have with Subversion. The Synchronize view has
two kinds of conflicts when using Subversion.
1. Synchronize conflicts are shown with the conflict decorator. This
scenario means you have local changes to a file, and the file has also
been changed in the repository. You need to perform an update to
retrieve the changes. This may or may not create the second kind of
conflict.
2. Files that are marked as conflicted in the working copy. These
are essentially outgoing changes, with the exception that the conflict
has to be resolved in the working copy before it can be committed.
We do not want to use the same indicator for both as the actions you
need to use are completely different. AFAIK, there is no way to use
some new icon we create for situation #2. If it is possible, we just
need someone to create the icon and submit a patch for the code. We
could possibly use the one we use as a decorator in other views,
although the style and format is different in the Synch view than in
the others.
> >> Doing an svn diff on the command line is smart and does a difference
> >> between the .mine file and head.
> >> In the synchronize view with subclipse, looking at a diff, shows the
> >> differences between the "diff output file" and head.
> >We provide the Edit Conflicts option for a file with conflicts to do a
> 3-way merge.
> Can we propagate this action into Synchronize view?
This option already exists in the Synch view. It only appears if the
file is marked as conflicted in the Subversion working copy.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Thu Jul 26 16:39:48 2007