lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Robert Muir <>
Subject Re: managing CHANGES.txt?
Date Wed, 01 Jun 2011 15:53:34 GMT
On Wed, Jun 1, 2011 at 11:21 AM, Ryan McKinley <> wrote:
> I know we have talked about this a few times, but not sure where we left off.
> My understanding was that if we change something in trunk and merge to
> 3.x we *only* add it to the 3.x CHANGES.  If it is only for 4.x it
> gets added to the 4.x CHANGES.  But it looks like we are actually
> keeping the two versions in sync.  Is this just extra work?

you just commit it to the version it was added.

For example, if you are adding something to 3x and trunk, commit it to
the 3x section of trunk's CHANGES.txt
then when you svn merge, there will be no merge conflict, it will just work.

To unsubscribe, e-mail:
For additional commands, e-mail:

View raw message