Bug 9964 – Add switch to prepare-ChangeLog to skip svn update of ChangeLog files

• Component: Tools / Tests
• Status: RESOLVED FIXED

[David Kilzer (:ddkilzer)]

With the fixes in Bug 9290, Bug 9693 and Bug 9848, there's really no need for prepare-ChangeLog to update ChangeLog files.  It puts them out-of-sync with the rest of your svn tree, and it takes time to run svn update on them.

[David Kilzer (:ddkilzer)]

Created attachment 9516 [details]
Patch v1

This makes prepare-ChangeLog hellafast when specifying files and directories on the command line!

[Timothy Hatcher]

How do we deal with conflicts that result from doing a prepare-ChangeLog then doing an svn up before committing?

[Darin Adler]

(In reply to comment #2)
> How do we deal with conflicts that result from doing a prepare-ChangeLog then
> doing an svn up before committing?

My question exactly!

[David Kilzer (:ddkilzer)]

(In reply to comment #3)
> (In reply to comment #2)
> > How do we deal with conflicts that result from doing a
> > prepare-ChangeLog then doing an svn up before committing?
> My question exactly!

I guess I must be missing some use cases that Apple engineers hit more frequently than open source committers.

The only time I would run prepare-ChangeLog and then commit immediately would be to make a build fix or perhaps to back out a patch.  Even then, it would be reasonably unlikely that someone has committed a patch between the time the build was broken and the time you commit a fix for the build.

Every other (99% of the) time, I use prepare-ChangeLog before svn-create-patch, then post the patch for review to Bugzilla.

Can you describe what scenarios would cause problems if this code was removed?  (If not, ignore this question.)

In place of removing the code, how about a command-line switch to turn the behavior on or off?  I would like it to be off by default (with a -u or --update switch to update ChangeLogs), but I could live with it being on by default and adding the ability to specify --no-update to turn it off.

Thoughts?

[Timothy Hatcher]

Adding a no update flag would be ok, but doing the update needs to be on by default. A common sisuation for us is to have a patch ready that we have been working on throught the day and many other changes have landed. Sometimes these changes get reviewed in person before the ChnageLog is written. Right before we want to land we will run prepare-ChangeLog, edit the ChangeLog then commit. If the ChangeLog was not updated before we commit we will have to resolve the changelog manually.

[Darin Adler]

Comment on attachment 9516 [details]
Patch v1

Please let it be on by default. We can consider changing the default later.

[David Kilzer (:ddkilzer)]

Created attachment 9536 [details]
Patch v2

Adds --[no-]update switch to disable svn update of ChangeLogs if desired.  Updating is enabled by default by popular demand.  :)

[David Kilzer (:ddkilzer)]

Committed revision 15516.