Re: SVN-4709 shelve: deleted file becomes 'replaced'

2018-01-26 Thread Johan Corveleyn
On Fri, Jan 26, 2018 at 8:33 AM, Branko Čibej wrote: > On 25.01.2018 19:47, Johan Corveleyn wrote: >> On Thu, Jan 25, 2018 at 1:41 PM, Julian Foad wrote: >>> Branko Čibej wrote: On 24.01.2018 22:32, Julian Foad wrote: > When 'svn patch' applies an 'add file' patch onto a WC path whose >>

Re: SVN-4709 shelve: deleted file becomes 'replaced'

2018-01-26 Thread Branko Čibej
On 26.01.2018 09:14, Johan Corveleyn wrote: > On Fri, Jan 26, 2018 at 8:33 AM, Branko Čibej wrote: >> On 25.01.2018 19:47, Johan Corveleyn wrote: >>> On Thu, Jan 25, 2018 at 1:41 PM, Julian Foad wrote: Branko Čibej wrote: > On 24.01.2018 22:32, Julian Foad wrote: >> When 'svn patch'

Re: SVN-4709 shelve: deleted file becomes 'replaced'

2018-01-26 Thread Johan Corveleyn
On Fri, Jan 26, 2018 at 9:36 AM, Branko Čibej wrote: > On 26.01.2018 09:14, Johan Corveleyn wrote: >> On Fri, Jan 26, 2018 at 8:33 AM, Branko Čibej wrote: >>> On 25.01.2018 19:47, Johan Corveleyn wrote: On Thu, Jan 25, 2018 at 1:41 PM, Julian Foad wrote: > Branko Čibej wrote: >> On

Re: SVN-4709 shelve: deleted file becomes 'replaced'

2018-01-26 Thread Stefan Sperling
On Fri, Jan 26, 2018 at 10:00:00AM +0100, Johan Corveleyn wrote: > If there is an obvious resolution, just do it (only if there is > ambiguity, ask the user). Except for those users that really, really > want to be bogged down by every trivial conflict. I'd say less that > 0,1 % of our users is eve

Re: Migrating our wiki to Confluence

2018-01-26 Thread C. Michael Pilato
On 01/25/2018 07:16 PM, Johan Corveleyn wrote: > Remaining problems: > * Mapping users works, but only if there is a corresponding account on > cwiki.a.o. Out of the 24 users that edited pages on our Moin wiki, 17 > don't have a confluence account (3 of which have only made a single > edit to add t