Remote Merge

[Erik Bågfors]

>
> The plan is to do it like this:
> bzr branch sftp://my@remote/branch local_branch
> cd local_branch
> <hack hack>
> bzr commit -m "Made some changes"
> Local branch is not up-to-date
> $bzr pull
> $bzr commit
>
> That's not decentralized, but it doesn't sound like you really want
> decentralized, at least for this branch.

So how is the plan to know when a branch should also commit to the
remote and when it shouldn't.  The way I see it, if I run "branch",
then I want a stand alone branch.  If I want a
commit-to-central-branch (I forget what this is called), then maybe we
should use another command such as checkout?

So, for example,
bzr checkout sftp://my@remote/branch local_branch
cd local_branch
<hack hack>
bzr commit -m "Made some changes"
Local branch is not up-to-date
$bzr pull
$bzr commit



/Erik