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

Re: [Subclipse-users] Bug with merge - ghost files appear in sync view

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 4 Aug 2011 11:22:48 -0400

Keep in mind that in Subversion 1.5 and 1.6 a merge to a tree can and will
update the svn:mergeinfo property on any paths that have that property set.
 So a merge that only merges changes to fileA will also update the mergeinfo
property on any other path in your WC that has that property set. So those
items will all show as items that need to be committed.

Also keep in mind that when you revert a file that was Added, even by merge,
Subversion does not delete the file from your WC. It will only remove the
scheduled addition and leave the file as unversioned.

Mark

On Thu, Aug 4, 2011 at 11:19 AM, David Balažic
<david.balazic_at_comtrade.com>wrote:

> Hi!
>
> There seems to be a bug in the merge code or Synchronize view.
>
> - I merge branch into my WC
> - in Synchronize view outgoing mode I see an added file
> - I revert it
> - it is still being shown, while another file appears before it (in the
> same folder,
> an actially pre-existing file, before the reverted one in alphabetic
> order)
> The newly appeared file has a left right arrow on its icon (red/blue).
> - I revert the folder, in the revert dialog deseleting a third file in the
> same folder (it has changes that I want to keep)
>
> Only after this step does the problem file disappeat from view.
>
> This happened seceral times.
>
> In short:
> After merge, the Outgoing mode shows:
> folder1/file8 - added (plus icon)
> folder1/file_a - changed
>
> I revert file8, then the display shows:
> folder1/file7 - left/right arrow on icon
> folder1/file8 - added (plus icon)
> folder1/file_a - changed
>
> Sublcipse 1.6.18
>
> Regards,
> David Balažic
> Software Engineer
>
> ComTrade
>
> Litijska 51, 1000 Ljubljana
> Slovenia
>
> phone: +386 81 60 8937
> fax: +386 1 586 52 70
>
> www.comtrade.com
>
> ------------------------------------------------------
>
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2809108
>
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe_at_subclipse.tigris.org].
>

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2809110
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2011-08-04 17:22:53 CEST

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