[RFC][PATCH] New options to choose fast-forwarding on merge.

[Aaron Bentley]

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

Jari Aalto wrote:
> It would be good is this behaviour could be be configured permanently
> in the bzr configuration file. I'can't think any case for myself not
> wanting always to do "pull --merge".

There were two reasons:
1. consistency: It's simpler to say "you never need to commit after a
pull, you always need to commit after a merge".  Saying "If pull falls
back to a merge, you need to commit" is messier.

2. mirroring: I do 'bzr pull' in a mirror of bzr.dev, it should never
report "branches are diverged".  If it does, I must have screwed up and
committed to my local bzr.dev mirror.  Falling back to merge isn't
helpful here; I want an error.

The argument for 2 is weaker these days, because mirroring is
best-supported by doing heavyweight checkouts of readonly branches.
That only became true as of 0.12, now that update works properly with
readonly branches.

Now, however, I wish that update listed new revisions the way pull -v does.

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

iD8DBQFFYemu0F+nu1YWqI0RAvaoAJ9Gley5NvuwNRS12sotaIUjD8M/sQCfWEuJ
JfXo2R0Qg0dWKK+hffJW7KU=
=Jj17
-----END PGP SIGNATURE-----