On Wed, Jul 14, 2010 at 08:47:17AM +0200, David Kastrup wrote: > Graham Percival <[email protected]> writes: > > > If you have the patch as a single file, then (in vim) it would be > > %s/2.13.28/2.13.29/g > > > > But if you're working on a separate branch (as is right and proper > > for a major change), then I'm not certain how to go about it. I'm > > looking forward to opinions. > > I don't see a problem here. Just merge origin/master into your work > branch occasionally, then the patch will be relative to the current > version.
The problem is the convert-ly rule for the changed syntax -- if he wrote the rule for 2.13.25 but doesn't merge until 2.13.29, then convert-ly will have an incorrect version. This also applies to the version number in input/regression/ files. I'm not entirely certain why he's changing the version number in Documentation/ files, since those should be updated by running convert-ly on them (followed by any manual changes that are necessary)... but here we're in uncharted and definitely disorganized territory. I will write up the problem and put it in the tracker; I don't think that I'll have time make a proposal for over a week. Cheers, - Graham _______________________________________________ lilypond-devel mailing list [email protected] http://lists.gnu.org/mailman/listinfo/lilypond-devel
