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

Re: Merging of conflicted svn:externals properties

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 21 Apr 2015 19:40:45 +0200

On 21.04.2015 17:19, Henneberg Erik wrote:
> We have the following problem/feature request for the svn:externals
> property:
> In our SVN repository, we use various directories with links to other
> folders in the repository via the svn:externals properties. This allows
> us to version our software components individually.
> During development, we often have to set some of the links from a tagged
> version to trunk or the other way around, or switch component versions
> etc...
> It happens more and more frequently that the svn:externals property
> conflicts when trying to update or commit to the repository.
> TortoiseSVN then only allows me to use ‘their’ or the ‘local’ property
> or change the svn:externals by hand (see also appended screenshot of the
> dialog).
> Is it possible to use the TortoiseMerge tool in such cases as it would
> be done when merging a file?
> It would be very helpful when the diffs are clearly visible and not
> every ‘external’ must be changed by hand.

This is possible in the upcoming version 1.9.
You can try a nightly build from trunk if you like:


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest interface to (Sub)version control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-04-21 19:40:39 CEST

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