On Wed, Jun 16, 2010 at 14:06, emerson <echofloripa.yell_at_gmail.com> wrote:
> Hi
>
> We are moving from a single trunk to a layered approach, with a
> unstable (same as the old trunk), and a stable branch. The code should
> be promoted to the stable branch only when a certain story would be
> done (finished and tested).
> When creating the story, several commits might had been necessary to
> complete it, and in all of them would have the story code (eg:#3145)
> on the commit message.
I hope your commits have more than just a number in them, maybe
describing the changes that were made to the code.
> Now my question: what is the best way to apply just the changes that
> were part of a specific story, and still keep all the individual
> commit comments?
>
> At a first thought, I think we would have to first locate all the
> changes to svn that had that code on the commit message, and then
> re-apply them to the stable branch, just not sure how to do it.
You're describing a normal usage of merging.
http://svnbook.red-bean.com/nightly/en/svn.branchmerge.html
You don't want to redo all those commit messages, you want the merge
to be aware of the history behind everything that's been done (which,
if you're using 1.5 or later, is taken care of), so that svn log can
trace back & all those messages fall right in line.
Received on 2010-06-16 20:12:24 CEST