Getting started with bzr-svn (was Re: bzr-svn and subversion revisions)

[John Szakmeister]

On Mon, Sep 7, 2009 at 12:30 PM, Jelmer Vernooij<jelmer at samba.org> wrote:
[snip]
>> *Sweet!*  Does this mean that we can repeatedly merge from the
>> mainline, and push with no ill effects?  If so, that's really nice.
>>
> No, if you repeatedly merge from the mainline you will just get an
> error trying to push your changes back to mainline unless you set this
> option.
>
> If you don't want to change what is on the mainline, don't merge it
> in. Rather, merge feature branches into the mainline.

Maybe if I explained our scenario a little better.  The issue is that
the Subversion repo is hosted offsite, with no network connection to
it.  What I'd like to do is clone the repo, bring it back to our
place, and have a team of guys implement a set of features.
Unfortunately, they're not small, and can take a while to implements
(months).  What I'd like to be able to do is clone the repo, branch
it, start implementing some of our new features and ocassionally push
our changes into a branch upstream, while also pulling down new
changes (by physically taking clones of our repos to the site).  The
trick is integrating the new revisions into our branch.  To date, I
haven't found an adequate way of doing this that doesn't disrupt the
ordering of commits.  Any thoughts?

-John