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

Merging of conflicted svn:externals properties

From: Henneberg Erik <Erik.Henneberg_at_newtec.de>
Date: Tue, 21 Apr 2015 17:19:08 +0200

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.
Thanks in advance!

Greetings,
Erik Henneberg

---------------------------------
We are using
TortoiseSVN 1.8.2, Build 24708 - 64 Bit , 2013/08/27 19:20:39
Subversion 1.8.3, -release

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

EditPropertyConflict.png
Received on 2015-04-21 17:30:12 CEST

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