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

[Subclipse-dev] [PATCH] Delete unmanaged resources/Filter conflicts

From: Paul Lorenz <plorenz_at_gmail.com>
Date: 2006-01-30 05:40:15 CET

Attached is patch which does two things.

1. Adds a preferences option to delete unmanaged resources on
revert/replace. So if you revert an add, it will be deleted after
reverting (to match the repository state).

2. Add a filter to the packages view to only show files with
conflicts. Makes it easy(er) to find files you need to look at after a
merge. Adds dependency on some jdt plugins. Also depends on the
warnings stuff. It works by checking if there is a svn conflict merge
marker for the resource.

This includes my last patch for cleaning up the reverts. Sorry for
mixing the patches all together, but I was working on them at the same
time (because testing the revert/delete on a huge project took a long
time).

Finally, I have problems understanding how and when the statuses get
updated. For example the isTextConflicted returned false all the time,
even when there was conflict, which is why I used the marker. I could
also have compared the old and new conflict paths, but that seemed
like it might be more expensive. Not sure. With the deletes, it would
seem like the files should have a statuses of unManaged after being
reverted (for adds), but that was only true some of the time (I think
in cases where I called refreshStatus on a sub folder). Anyway, when
reviewing the patch, keep that in mind, let me know if there is a
better way to do those things.

Comments/improvement suggestions welcome.
If you would like separated patches, I can try to do that this week some time.

thanks,
Paul

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

Received on Mon Jan 30 05:40:46 2006

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