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

Re: [Subclipse-users] Merge marks new file as old

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 11 Feb 2013 09:59:43 -0500

I believe the command line would show the same thing if you were to
run svn status.

When merge adds the folder and file, it is an Add with History (Copy).
 So when the folder is added when you commit the file will be too.
The file does not show as modified because it technically isn't.

There was a thread on the Subversion users@ list about this recently.
I cannot recall if they are going to change how this is reported, but
it was discussed.

Mark

On Mon, Feb 11, 2013 at 9:55 AM, David Balažic
<david.balazic_at_comtrade.com> wrote:
> Hi!
>
> (see versions below)
>
> I merged from trunk to a branch a change that created a new folder and an one new file in it.
>
> After merge in my workspace I see them, but the file is marked as already present (it is not marked as added - plus sign on the icon).
> If I try to commit the change, only the folder is listed in the commit dialog (and in the Synchronize view).
>
> "It thinks" the file was there from before.
> If I make a change in this file, then the file is listed as changed (not as "added"), showing diff (in the Team Sync view, by doubleclicking it, or by menu Compare With / Base Revision) shows the change I just made as only change. As if the file were already there before the merge.
>
> If I revert, the file correctly disappears.
>
> Doing the same operations (on the same working copy) with TortoiseSVN works correctly.
>
>
>
> Eclipse Java EE IDE for Web Developers.
> Version: Indigo Service Release 2
> Build id: 20120216-1857
>
> Subclipse (Required) 1.8.18 org.tigris.subversion.subclipse.feature.group tigris.org
> Subversion Client Adapter (Required) 1.8.3 org.tigris.subversion.clientadapter.feature.feature.group tigris.org
> Subversion JavaHL Native Library Adapter 1.7.8.1 org.tigris.subversion.clientadapter.javahl.feature.feature.group tigris.org
>
> David Balažic
> Software Engineer
>
> ComTrade
>
> Letališka cesta 29b, 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=3048350
>
> 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=3048357
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2013-02-11 15:59:49 CET

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