Branches without working trees
Aaron Bentley
aaron.bentley at utoronto.ca
Sat Oct 29 22:25:12 BST 2005
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
John A Meinel wrote:
> This means I moved "WorkingTree.pull()" back into Branch.
Thanks.
> I also allow for a separate .bzr/x-push-target location. For some
> working models, you might have a default upstream, with a different
> default push location.
I think we should start using a single per-tree consiguration file for this.
> We could also do something like --friends, which contains a list of the
> recent push/pull locations. Then it would look like:
>
> bzr merge --friends=1
> bzr push --friends=2
> bzr missing # The primary friend is the parent
I have found this style useful. In Fai, merge will try each friend
until it finds one with changes, and merges it.
> This is getting pretty close to having branch aliases, which might be a
> better solution.
Aliases are nice, but I find that default locations are nicer.
Wildcard support in merge could be good. It would use the friends list
or a list of 'seen branches' in ~/.bazaar
$ cd bzr.ab
$ bzr merge *integration
using people.ubuntu.com/~robertc/baz2.0/integration
0 conflicts encountered.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFDY+i40F+nu1YWqI0RAtKHAJ4w9jt5d5HZTB36q774wA0i67HyRQCfdkEO
6w5aY2Zh/R5yKxpezXbBUqM=
=axVt
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list