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

On Mon, Jul 16, 2018 at 05:49:53PM +0100, Julian Foad wrote:
> 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.

It did always conflict for me as well.

I may have used --theirs-conflict, or perhaps the interactive file
merge with the "12" option which outputs both conflicting parts
back to back, and then edited the file. I don't remember exactly :)
Received on 2018-07-17 11:31:22 CEST