RE: [Subclipse-users] Do not mark incorrectly merged file as file with outgoing changes in Synchronize view

Hi!

>> Wouldn't it be good anyhow for subclipse to know about these files so

>> 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?

>> 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.

>> 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?

----
Alex Shatalin
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org