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

Re: [Subclipse-dev] issues with incoming changes

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-09-20 21:01:45 CEST

Eugene Kuleshov <eu@md.pp.ru> wrote on 09/20/2006 02:57:04 PM:

> Mark Phippard wrote:
> >> That makese sense. On the other hand all folders above
> >> src/main/java/org/springframework/webflow/conversation folder have
the
> >> same revision, so it should be enough just to show
> >> src/main/java/org/springframework/webflow/conversation folder.
> >>
> > AFAIK, the UI of the view comes from the Synch view, not us. We just
give
> > it the SyncInfo's. This was the whole issue why update never worked
> > right. When we were only giving it the files, the view puts the
folders
> > in itself, but they are not really "there" from the standpoint of code

> > that asks for what was selected. Now that we identify them as
modified,
> > the view is showing them like this.
> >
> What I was trying to say, that you probably have SyncInfo for these
> parent folders. So, it is probably possible to remove it from the
> syncronization.

We'd essentially always end up having to just provuide the SyncInfo for
the Project node, if we were going to follow that approach. But that then
also removes the ability to do a recursive update at some lower level in
the structure.

> >>> Your project folder must show a conflict because it has an outgoing
> property change but it is not at the head revision.
> >> I see... Rolling back property change resolved conflict. It would
be
> >> handy if change details would say something about properties (now it
> >> just says "incoming changes").
> >> I also wonder if property can be shown as a special node in the
sync
> >> view, so it can be compared or reverted back same as any other
resource.
> >>
> > Yes, we have talked about this before. I agree it would be very nice
but
> > I do not have the faintest idea how to accomplish it.
> >
> Can't you just add a SyncInfo for the properties? So, it would look
> like "fake" file node.

I really have no idea. I suspect it is a lot more complicated than that.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: dev-help@subclipse.tigris.org
Received on Wed Sep 20 21:01:50 2006

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