--On Saturday, April 2, 2005 4:36 PM -0600 kfogel@collab.net wrote:
> When we merge changes from one line to another, we usually give the
> revision numbers (or revision number range) that was merged. In this
> case it would probably be okay just to say "Bring CHANGES up-to-date
> with trunk master copy" or something like that, as long as it's clear
> exactly what's going on.
Noted.
> Regarding the dist.sh portion of the log message... uh, WTF, if I may
> be so bold? :-) It ought to say *something* indicating the nature of
> the changes. And especially if changes are "in progress", then the
> commit should say what the final goal is, and how much progress has
> been made toward that. For example, in the way r13832 and r13833 do.
The issue is that I didn't really intend to commit dist.sh at that time. My
goal was to get 1.1.4 out for review - the dist.sh log was, IMHO, less
important to clean up immediately and I haven't had any 'Net access since I
sent the email regarding 1.1.4. (Yet, that script was what I used to produce
the release.)
I will fix up the log message later this evening. My apologies - I didn't
intend to commit it at that time, but it wasn't really possible (nor feasible)
for me to revert those changes at that time.
> controversy, it's probably just as well that the changes were
> committed on the branch, but ordinarily trunk would (I think?) be a
> better place for dist.sh maintenance (i.e., trunk for the master
> change, then port it over to whatever release branches need it).
The issue is that I thought dist.sh was associated with the branch that it was
producing a release for - not the trunk which is a different release line. If
that is incorrect, then I can merge whatever changes back into the trunk and
also make it much more explicit to only use trunk/dist.sh in the docs.
(Perhaps we should remove dist.sh from the branches?) -- justin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Apr 3 01:22:08 2005