[MERGE/RFC] Merge prefers to use submit branch

Aaron Bentley aaron.bentley at utoronto.ca
Wed Dec 19 23:49:04 GMT 2007


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:
> I'm okay with using submit location first, but I think it mostly point
> to us needing a merge location, separate from parent location.

I would rather avoid having too many associated locations.  I don't
think we need a merge location if we have a submit location.

> I also know there are people who do:
> 
> bzr pull
> # oops, it failed
> bzr merge

Sure, but for me that is a rare case.

> Yes, they could use bzr merge --pull, but for people who are used to
> doing the former, this may be a surprising change.

Could you map out this use case a bit more?

> I'm also not sure that people will commonly do:
> 
>   bzr merge joe
>   bzr send
> 
> And want it to go to joe.

That is the only way I operate.  Joe is bzr.dev for me.

Typically, if you merge from a single location, you merge from the
branch where you ultimately plan to submit your changes.

> I think it is common for our workflow because we develop solely around a
> trunk. A lot of people don't, though. They might develop only *on*
> trunk, or in more of a mesh.

If they develop *on* a trunk, they don't merge at all, right?

If they're doing mesh merging, they'll need to specify the merge
location every time anyhow.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHaa3v0F+nu1YWqI0RAjTDAJ4jAyQ+oHjtV059CF6TzOIL/IPyJgCfV1MF
+G5OHy7jN/V6lK4ZtGm+qz0=
=qZ5L
-----END PGP SIGNATURE-----



More information about the bazaar mailing list