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

Switching to SVN trunk to use new tree conflict resolution API in TortoiseSVN

From: Ivan Zhakov <ivan_at_visualsvn.com>
Date: Wed, 24 Aug 2016 21:19:48 +0300

Hi!

There is some progress on tree conflict resolution in Subversion
1.10.x-dev [1]. For example Subversion 1.10.x-dev can
semi-automatically resolve simple tree conflicts involving file moves
[2]

I'd like to add support for new tree conflict resolution API in
TortoiseSVN to test how it works in GUI. This will require to switch
TortoiseSVN trunk to build with Subversion trunk (pinned to a specific
revision of course), instead of Subversion 1.9.x. Repository and
working copy format didn't change in Subversion trunk, so I don't
expect serious compatibility problems.

Does this sound like something that can be done in TSVN trunk? Or
should I create a branch?

[1] http://svn.haxx.se/dev/archive-2016-06/0006.shtml
[2] http://svn.haxx.se/dev/archive-2016-06/0012.shtml

-- 
Ivan Zhakov
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3183469
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-08-24 20:20:18 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.