[RFC] I want to disable submit_branch on my computer for all branches. How can I do that?

Aaron Bentley aaron at aaronbentley.com
Thu May 12 19:32:06 UTC 2011


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

On 11-05-12 08:31 AM, vila wrote:
> 4) I merge trunk in my branch to ensure I can still land it. In this
> case, submit_branch is right.
> 
> I think that's the use case that was considered when making merge
> remember submit_branch.

It was.

> In this case the merge source *is* the submit target and often the
> parent branch too...

But in such cases, the parent branch is mostly useless, because you
can't pull trunk into a feature branch.  The more interesting case is
where you want to pull the feature branch from another copy of it.

> 
>     > So, as a matter of backward compatibility I don't think
>     > submit_branch can be removed at all. But I can't prevent merge to
>     > store the location to branch.conf even if I use --no-remember
>     > command-line option,
> 
> Should be fixed.

You can say that, but it's doing exactly what you'd expect: --remember
overrides the default behaviour, so --no-remember restores the default
behaviour.  If you "fix" it, be sure to provide a way to get the default
behaviour the way you get with
"bzr alias merge=merge --remember; bzr merge --no-remember".

>     > although bzr never complains about that option. It just ignores it
>     > and does what it does.
> 
> That's another bug, I think --remember works but -=no-remember doesn't
> (that's the bug).

I think it -no-remember works, but you're expecting it to behave
differently from other --no- options.

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

iEYEARECAAYFAk3MNbYACgkQ0F+nu1YWqI0ulgCfbKCWGEXrrkM7bF2/yuwSE9qX
NRAAnAk/Os6dg96jQP7WELEKvn7/739G
=BcyL
-----END PGP SIGNATURE-----



More information about the bazaar mailing list