Quick documentation-related question and long-term feature branches with bzr-svn...

[John Szakmeister]

On Wed, Oct 14, 2009 at 12:17 PM, John Arbash Meinel
<john at arbash-meinel.com> wrote:
[snip]
> Nice post. Though I wonder about this:
>  Always merge your Bazaar branch into the Subversion mainline when
>  you’ve merged changes from Subversion into your branch.
>
> Why do you need to merge 'myhacks' into trunk just because you merged
> 'trunk' into 'myhacks'. ?
>
> maybe I'm misunderstanding the statement?

I should clean up the wording there.  More like:
   Never push to a branch that you've merged from.  To reintegrate the
branch, use merge instead.

The problem if you merge trunk into myhacks, and then push myhacks
directly into trunk, you'll reorder the mainline commits... and that's
a problem for Subversion users.  However, if you merge myhacks back to
trunk (to integrate your changes into the mainline), then all is well.

-John