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

[John Arbash Meinel]

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

On 5/12/2011 4:47 PM, Alexander Belchenko wrote:
> What's difference between `diff -rsubmit:` and `merge --preview` then?
> 

Note that submit branch also has a 'neat trick' if you set it to a local
branch with 'public_location' set. So for me, I set:
  submit_branch = C:/Users/jameinel/dev/bzr/bzr.dev

With a public location of lp:bzr. That way "-rsubmit:" is always
evaluated locally, rather than connecting to Launchpad to find the
common ancestor.



diff -r submit:

 Compute the common ancestor, and show the difference from this branch
 to my submit branch.

merge --preview

 Actually do a merge, and show me the result.


Main differences

1) merge --preview will show you conflicts, diff -r submit: is always a
   clean diff.

2) Similarly, if both sides change something the exact same way, merge
   --preview will show no change, diff -rsubmit: will show the new
   change.

3) Overall merge --preview is more accurate, but generally more
expensive to compute. Especially before some of my recent fixes, where
merge would always walk the whole tree, rather than just noticing recent
deltas.

At *this* point, I think "bzr diff -rsubmit:..-1" is going to be the
fastest, and "bzr diff -rsubmit:" is going to be a bit slow, because it
goes via the generic "check everything" path. "bzr merge --preview" I'm
not really sure where it would be at. Theoretically it should be slower
than 'bzr diff -rsubmit:'. (Of course, if Vincent finds the 5+s to
connect to Launchpad acceptable, this obviously doesn't matter to him.)

4) Location. "bzr diff -rsubmit:" is done in the branch you are writing,
"bzr merge --preview" is done in the branch you are merging into.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk3L950ACgkQJdeBCYSNAAPbbACfT+K4ogeFqAICeuMbzx9O8uFx
54wAoM9mHFGr4huYQdN71uQfwfaE+OuP
=2xv5
-----END PGP SIGNATURE-----