Remote Merge

[John A Meinel]

Nathaniel McCallum wrote:
> On Thu, 2005-10-27 at 11:43 -0500, John A Meinel wrote:
>> Nathaniel McCallum wrote:
>>> Maybe I'm missing a command or something here, but this is what I want
>>> to do:
>>>
>>> bzr branch sftp://my@remote/branch local_branch
>>> cd local_branch
>>> <make changes to local branch>
>>> bzr merge sftp://my@remote/branch

...

> 
> So (?):
>   bzr branch sftp://my@remote/branch local_branch
>   cd local_branch
>   <make changes to local branch>
>   bzr merge sftp://my@remote/branch  # Merges remote and local into the local branch
>   bzr push sftp://my@remote/branch   # "Commits" to the remote branch

One thing you should be aware of. Whenever you run branch, missing, or
pull, if not already set, bzr will set the "parent" of the branch. This
is a default location where the other commands will take effect. So you
don't need to type it out every time. If you ever change what the
"parent" or "upstream" branch is, then you would need
	bzr pull --remember sftp://my@remote/other_branch

You probably need to do:
bzr branch sftp://my@remote/branch local_branch
cd local_branch
<hack hack>
bzr commit -m "Made some changes"
bzr missing # See what is missing locally compared
	    # with the "parent"

bzr merge
bzr commit -m "[merge] up-to-date with build branch"
bzr push

The commit is necessary, because merge doesn't commit anything. This
gives you a chance to clean anything up that might not be correct after
a merge.

bzr pull, will pull changes, and "commit" them locally, but it requires
that the branch being pulled is a descendent of the current branch.

> 
> The scenario that we have setup is that we have multiple users each with
> their own dev branches and we have some buildbots that build on
> "checkin".  Thus, we want to have the ability to have multiple people
> commit to the build branches (via ssh keys).  Make sense?

It does make sense. Though you might consider setting up the Patch Queue
Manager (pqm), as mentioned by Robert Collins.

It has some nice other things, like requiring the test suite to pass
before it will commit a merge. Which is nice to have for an official
mainline, while still letting everyone have their own dev branches.

Also, Aaron Bentley was working on bound branches/centralized storage.
Which would mean that "bzr commit" would also push the change to the
bound branch. If he doesn't get to it, then I will. But he has already
done some of the work.

John
=:->

> 
> Nathaniel
> 
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051027/58d9363a/attachment.pgp