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

Re: [RFC] Move CHANGES and COMMITTERS out of trunk/branches

From: Julian Foad <julian_at_foad.me.uk>
Date: Mon, 16 Jul 2018 17:49:53 +0100

Julian Foad wrote:
> Stefan Sperling wrote:
> >I ran a sync merge from trunk/CHANGES to branch/CHANGES, and manually
> >deleted any entries above the one for the release being prepared.
> >
> >This worked quite well for me and I never found it burdensome.
>
> That, or scripting that as Johan suggested, sounds fine for now.

Actually the "sync merge" way isn't as automatic as I would like. The merge always conflicts when there is a new or modified trunk CHANGES entry for 1.10.x. Maybe --accept=mine-conflict would completely solve that. Haven't tested that.

Coincidentally, GitLab recently wrote about their similar bot not identical issue:

  https://about.gitlab.com/2018/07/03/solving-gitlabs-changelog-conflict-crisis/

-- 
- Julian
Received on 2018-07-16 18:50:04 CEST

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