Daniel John Debrunner wrote:
Rick Hillegas wrote:
Hi Dan,
I'm just creating a slot in JIRA for tracking sequences of related
changes. In this case, I would like to have a permanent record of the
work done to merge the trunk into the 10.2 branch. This involves a
number of separate commits which are part of a single logical operation.
I don't see the value in creating a separate JIRA for each of these
merges and I see some value in being able to survey the whole logical
operation at a glance.
OK - but do you need the word "placeholder" in the summary. Why not just
have the summary decribe what you are doing. In a way all Jira issues
are "placeholders" for work items. use a summary like:
Mega-merge all required changes from trunk to 10.2 branch before beta rc2
If there's a better way to accomplish this goal, I'm always eager to learn!
I do think maintaining the jira issue numbers from the original fixes in
the merge commit messages is essential. Seems like that should be fairly
easy to do.
Dan.
What I am about to do with the next and biggest chunk of this bulk merge
is to add in the JIRA numbers for all the intervening submissions which
bothered to record their linkage. I obtained these by doing an "svn
log". Out of 17 commits which recorded this linkage, I have 9 distinct
JIRA entries. Unfortunately, there are another 17 commits which didn't
bother to record their JIRA linkage. I will send out a list of these
soon and, hopefully, the committers can supply this information.
I would also like to go back and edit the commit comments for the two
merges I've already done. I'd like to add JIRA entries to them too.
Would appreciate a pointer on how to edit a subversion comment.
Thanks,
-Rick
