[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: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Mon, 16 Jul 2018 16:57:59 +0000

Julian Foad wrote on Mon, 16 Jul 2018 17:49 +0100:
> 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.

We could have CHANGES-1.9, CHANGES-1.10, etc files, and as part of
rolling a tarball concatenate them into a single (generated) CHANGES
file. Then it would be much easier to merge just 1.9-and-earlier
changes to 1.9, etc. (And it would save us writing a parser)
Received on 2018-07-16 18:58:09 CEST

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