You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by emerson cargnin <ec...@gmail.com> on 2010/06/16 17:23:13 UTC

applying multiple commits done to a branch to another branch

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.

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.

Any ideas?

regards
Emerson

applying multiple commits done to a branch to another branch

Posted by emerson cargnin <ec...@gmail.com>.
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.

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.

Any ideas?

regards
Emerson