[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Wed, 29 Aug 2018 07:52:53 +0000

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 1839421 roadmap.html
> M 1839421 quick-start.html
> M 1839421 faq.html
> M 1839421 .
> Status against revision: 1839421
> Is this normal?

It's normal for publish to be ahead of staging. Just do a cherry-pick
merge from staging to publish: 'svn merge -cN ^/.../staging' in a wc of
publish. (A sync merge from staging to publish --- opposite of what you
tried --- might work too.)

Could you please use a log message of the form "* download.html..."?
That makes it easier for us to read the log later. See previous log
messages for examples or <https://subversion.apache.org/patches> for the
gory details. Thanks!
Received on 2018-08-29 09:53:11 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.