Re: Reintragration using 'swtich'

2018-08-22 Thread Daniel Shahaf
Anton Shepelev wrote on Wed, 22 Aug 2018 20:03 +0300: > Is the wroking copy of the branch not required for reintegration? It's not required. You can 'switch' your working copy to trunk and run 'svn merge' passing it the URL of the feature branch.

Reintragration using 'swtich'

2018-08-22 Thread Anton Shepelev
Hello, all I have created a new branch on the server using the ^ notation, switched to it from my trunk, and made some changes. Now, in order to reintegrate, the manual says I need a working copy of the trunk, and that I can obtain one using 'switch'. If I, howev- er, I swtich locally b

Re: svn_load_dirs doesn't support filenames with @ in

2018-08-22 Thread Daniel Shahaf
Ryan Schmidt wrote on Tue, 21 Aug 2018 14:16 -0500: > On Aug 21, 2018, at 05:43, Daniel Shahaf wrote: > > j...@beniston.com wrote on Tue, 21 Aug 2018 09:40 +0100: > >> This patch adds @ to the end of the filename, to make it work. > > > > Thanks jon. Committed with tweaks in r1838539. > > It see