[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: Hans-Emil Skogh <Hans-Emil.Skogh_at_tritech.se>
Date: Thu, 13 Aug 2009 14:22:35 +0200

>> 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.

 

But wouldn't it be very helpful to let TSVN (optionally) help you by making an update to the external if present? There is certainly a big chance to miss the update if you have to do it as a manual step.

> 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.

That is much more obvious. You quickly learn that every time you change an external you will have to manually run an update. For merges this is not the case.

(But when you mention it, it would be kind of nifty to have the externals dialog (optionally) update modified externals when saved.)

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

The explanation of how this is by design in SVN makes the case of adding it to TSVN (IMHO) even stronger . The reason for not doing it automatically all the time (in SVN) is sound, but to have an optional helper to do it for you (and make it harder to forget and thereby make a mistake) would absolutely make sense, and such things are TSVN:s forte!

 

(Especially for people who are not used to working with externals. The performs a merge and then wonders why the merge is broken since an external has been updated. It is not very intuitive to make an update directly *after* a merge, unless you are intimately familiar with how externals work.)

 

Hans-Emil

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2383258

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-13 14:23:16 CEST

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