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

Re: Merging externals-properties

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 13 Aug 2009 09:56:41 +0200

On 13.08.2009 09:04, Hans-Emil Skogh wrote:
> Hi!
> When I perform a merge that contains an updated (or added) external
> (that is, when the merge source has a change in an external property
> that will be applied to the merge target), the external itself needs an
> "Update" before the acctual change is reflected in the working copy.

That's by design. You only merge the *property*. The external itself
depends on that property, so after changing that property you have to
run an update for those changes to take effect in the external folder.
It's the very same if you edit the external property manually - if you
don't run update after changing it, the externals folder won't get changed.

And yes, that's all done in the svn library.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2383190
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-13 09:56:56 CEST

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