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-3Yc0+2ew-E0_vudNWfbL5XrB_nAdxYEbxJQYvrDVnDv4xg@mail.gmail.com> |
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: [[email protected]].