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

Merging externals-properties

From: Hans-Emil Skogh <Hans-Emil.Skogh_at_tritech.se>
Date: Thu, 13 Aug 2009 09:04:12 +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.
This is kind of unfortunate, as it is not always easy to spot if a merge contains changes to the externals in a project. And if you miss doing an update to the externals after the merge you essentially end up testing something else than what people will get when they update to your committed result, as their externals will update automatically.
This might be something that should be addressed in the core SVN project, but I'm not sure, so I'll start with proposing a TSVN-fix:
How about adding a check box to the merge dialog that says "Automatically update affected externals" (that is checked by default). When checked, Tortoise would perform an update on any folder that has an externals property modified when the merge is finished.


To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-13 09:04:26 CEST

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