Re: svn commit: r1838746 - /subversion/site/staging/download.html

2018-08-29 Thread Daniel Shahaf
sebb AT ASF wrote on Tue, 28 Aug 2018 11:45 +0100: > OK, so how do I do the merge? > > I tried using the following in a fresh checkout of the staging branch: > > svn merge ^/subversion/site/publish > > However it showed changes I have not made, so I am loath to commit them: > > $ svn -u st > M

Re: svn commit: r1838746 - /subversion/site/staging/download.html

2018-08-28 Thread sebb AT ASF
OK, so how do I do the merge? I tried using the following in a fresh checkout of the staging branch: svn merge ^/subversion/site/publish However it showed changes I have not made, so I am loath to commit them: $ svn -u st M 1839421 roadmap.html M 1839421 quick-start.html M

Re: svn commit: r1838746 - /subversion/site/staging/download.html

2018-08-25 Thread Stefan
On 25/08/2018 18:06, sebb AT ASF wrote: > On 25 August 2018 at 13:44, Stefan wrote: >> On 25/08/2018 14:37, Stefan wrote: >>> On 23/08/2018 20:01, s...@apache.org wrote: Author: sebb Date: Thu Aug 23 18:01:30 2018 New Revision: 1838746 URL: http://svn.apache.org/viewvc?rev

Re: svn commit: r1838746 - /subversion/site/staging/download.html

2018-08-25 Thread sebb AT ASF
On 25 August 2018 at 13:44, Stefan wrote: > On 25/08/2018 14:37, Stefan wrote: >> On 23/08/2018 20:01, s...@apache.org wrote: >>> Author: sebb >>> Date: Thu Aug 23 18:01:30 2018 >>> New Revision: 1838746 >>> >>> URL: http://svn.apache.org/viewvc?rev=1838746&view=rev >>> Log: >>> SVN-4736 - fix gpg

Re: svn commit: r1838746 - /subversion/site/staging/download.html

2018-08-25 Thread Stefan
On 25/08/2018 14:37, Stefan wrote: > On 23/08/2018 20:01, s...@apache.org wrote: >> Author: sebb >> Date: Thu Aug 23 18:01:30 2018 >> New Revision: 1838746 >> >> URL: http://svn.apache.org/viewvc?rev=1838746&view=rev >> Log: >> SVN-4736 - fix gpg command >> >> Modified: >> subversion/site/stagi

Re: svn commit: r1838746 - /subversion/site/staging/download.html

2018-08-25 Thread Stefan
On 23/08/2018 20:01, s...@apache.org wrote: > Author: sebb > Date: Thu Aug 23 18:01:30 2018 > New Revision: 1838746 > > URL: http://svn.apache.org/viewvc?rev=1838746&view=rev > Log: > SVN-4736 - fix gpg command > > Modified: > subversion/site/staging/download.html > > Modified: subversion/site/