Re: Switching to SVN trunk to use new tree conflict resolution API in TortoiseSVN
Ivan Zhakov <[email protected]>
| Newsgroups | gmane.comp.version-control.subversion.tortoisesvn.devel |
|---|---|
| Message-ID | <CABw-3Yeh1=JZh63Y-FivGmoafO9MeVmvbYGfLzzVEJELSk2ttQ@mail.gmail.com> |
On 24 August 2016 at 21:34, Stefan Küng <[email protected]> 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/dev/archive-2016-06/0006.shtml >> [2] http://svn.haxx.se/dev/archive-2016-06/0012.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 ------------------------------------------------------ http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3183571 To unsubscribe from this discussion, e-mail: [[email protected]].