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

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

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-07-26 12:59:07 CEST

On 7/26/07, Alexander Shatalin <Alexander.Shatalin@borland.com> wrote:
> Subclipse eclipse client (1.2.2) Steps to repeat:
>
> - Invoke Team/Synchronize with Repository action
> - If there are any Conflicts in "Synchronize" view click "Update" ->
> conflicting file marked as "file with outgoing changes", 3 additional
> "added" files created: *.mine, *.rXXX, *.xYYY
>
> I expect to see original file marked as "Conflicting" and not see
> additional 3 files at all in this view.
>
> I'm posting this bug report here in accordance with the guidelines.
> Please let me know if I can submit a bug tracker issue for this problem.

You can file an enhancement, but I do not see how it can be done. We
rely on the informartion Subversion tells us about a file. If it said
these were ignored, we would not show them. It says they are
unversioned. OK, so suppose we can develop a routine to discover if
they are really these merge files that people do not want to see. We
would then have to run that routine every time Subversion tells us a
file is unversioned to make sure it was telling us the truth. The
feature might not be worth the performance hit.

-- 
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 12:57:51 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.