No, those should be decorated as conflicts and show in your normal
views. The only reason we added a special view for tree conflicts is
that one of the most common types of tree conflicts involves situation
like incoming updates on top of deletes. Since you do not have the
item with the conflict in your working copy,we needed a special view
where we could show these items. They would not exist in a regular
Eclipse view so we would not have anything to hook a UI option on.
On Fri, Mar 25, 2011 at 3:00 PM, Darren Lee Ang <enigma_at_ktb.net> wrote:
> Hmm, that may be my problem then, incorrect expectations.
> I was expecting file conflicts to also be displayed in this view.
> I had thought "Tree conflicts" meant any conflict in that project tree. Not
> just "tree conflicts".
> Thanks for the clarification.
> -- D
> On 3/25/2011 11:53 AM, Mark Phippard wrote:
>> On Fri, Mar 25, 2011 at 2:10 PM, Darren Lee Ang<enigma_at_ktb.net> wrote:
>>> I've been trying to dig up why it doesn't show any conflicts when I
>>> select Team -> Show Tree Conflicts, but everything seems to be in
>>> regards to how slow it is.
>>> However, even if I wait for a day, nothing shows up. It doesn't look
>>> like it is doing anything.
>>> This occurs even when I select the folder that contains the conflicts.
>>> I know there is a conflict, since Team -> Update to Head shows it and
>>> using svn shows it.
>> Are you sure you have a tree conflict and not just a regular text
>> conflict? The latter do not show in this view.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2011-03-25 20:04:30 CET