Login | Register
My pages Projects Community openCollabNet

Discussions > dev > Re: Switching to SVN trunk to use new tree conflict resolution API in TortoiseSVN

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

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

Author Ivan Zhakov <ivan at visualsvn dot com>
Full name Ivan Zhakov <ivan at visualsvn dot com>
Date 2016-08-25 02:41:19 PDT
Message On 24 August 2016 at 21:34, Stefan Küng <tortoisesvn at gmail dot com> wrote:
> On 24.08.2016 20:19, Ivan Zhakov wrote:
>> 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/d​ev/archive-2016-06/0​006.shtml
>> [2] http://svn.haxx.se/d​ev/archive-2016-06/0​012.shtml
>>
>
> Great!
> I think we can do this directly on trunk - we already have a stable
> branch, so on trunk we can implement new things as we go. And even if
> something gets broken on trunk, that's what it's there for: so users can
> test and report back.
>
Done in r27405-27408. I hope nightly build will be successful.

--
Ivan Zhakov

« Previous message in topic | 3 of 3 | Next message in topic »

Messages

Show all messages in topic

Switching to SVN trunk to use new tree conflict resolution API in TortoiseSVN Ivan Zhakov <ivan at visualsvn dot com> Ivan Zhakov <ivan at visualsvn dot com> 2016-08-24 11:20:13 PDT
     Re: Switching to SVN trunk to use new tree conflict resolution API in TortoiseSVN steveking Stefan Küng 2016-08-24 11:34:55 PDT
         Re: Switching to SVN trunk to use new tree conflict resolution API in TortoiseSVN Ivan Zhakov <ivan at visualsvn dot com> Ivan Zhakov <ivan at visualsvn dot com> 2016-08-25 02:41:19 PDT
Messages per page: