subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Julian Foad <julianf...@apache.org>
Subject Website 'staging' branch catch-up merges [was: svn commit: r1817775]
Date Wed, 13 Dec 2017 20:28:07 GMT
Stefan wrote:
> On 11/12/2017 18:15, Daniel Shahaf wrote:
>> julianfoad@apache.org wrote on Mon, 11 Dec 2017 13:41 +0000:
>>> Modified:
>>>      subversion/site/publish/docs/community-guide/releasing.part.html
>> Could you backport this to staging/ so future changes to staging don't
>> merge conflict when they are published?
> Since I was working on the site right now, I took the liberty and
> quickly did it in r1817860.

Thanks, Stefan.

We discussed on IRC about this. I see 'staging' as being a development 
branch and 'publish' as being the trunk, and changes being made directly 
on the 'trunk' or on the branch according to how the developer feels 
about needing or not needing a staging point. From that point of view, 
this merge would be a catch-up merge and would be the normal expected 
practice for anyone working on the staging branch to do from time to 
time and immediately before promoting changes to 'publish'.

However that was just my assumption -- we haven't established that work 
flow as a community.

Various other ideas and points were made on IRC -- see the log, starting 
here, 25 mins long:
http://colabti.org/irclogger/irclogger_log/svn-dev?date=2017-12-11#l98

- Julian

Mime
View raw message