[PATCH] Branch and pull-- now with remote

Erik Bågfors zindar at gmail.com
Sun May 29 10:11:31 BST 2005


Wow... this is soo cool.  I just tried it and it works great!

now, if we only merge was able to use the same source as pull by default

: [bagfors at zyrgelkwyt]$ ; bzr pull
bzr: error: These branches have diverged.  Try merge.

: [bagfors at zyrgelkwyt]$ ; bzr merge

And... then of course, merging/cherrypicking and still keeping the
changesets/comitter/messages etc :)

Really really cool.  bzr is really moving very fast forward.

great work!

/Erik



On 5/29/05, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> As it turns out, there's not much more to be done to support remote
> branches.
> 
> This updated patch adds the ability to branch and pull from remote
> branches.  So now, this does work:
> $ bzr branch http://www.bazaar-ng.org/bzr/bzr.dev
> 
> It's just that it works pretty slowly, because it's not pipelined.
> 
> More interesting is bzr pull.  This will allow you to pull the latest
> changes in, without clobbering local changes.
> 
> Me, I do some development at home, some at work.  I keep a third branch
> alive on a central server that I push/pull from.  So now, I can do
> 
> # home:
> $ bzr commit
> $ bzr-push
> 
> # work:
> $ bzr pull
> $ bzr commit
> $ bzr-push
> 
> # home:
> $ bzr pull
> $ bzr commit
> $ bzr-push
> 
> etc....
> 
> Aaron
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.2.5 (GNU/Linux)
> Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
> 
> iD8DBQFCmULu0F+nu1YWqI0RAvqRAJ9XyxgJB/djnWMCUEu2uRpTpY9KbQCdFMDV
> dFCJUR9Meto0MgIo+2v89Ng=
> =wjf3
> -----END PGP SIGNATURE-----
> 
> 
>




More information about the bazaar mailing list