[MERGE][bug 115343] Allow 'bzr branch -r revid:xxx' to branch any revision in ancestry

[Aaron Bentley]

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

John Arbash Meinel wrote:

> However the:
>   branch2 = wt.branch.sprout(repo.bzrdir, revision_id='rev3')
> 
> I'm much less comfortable with. Having a branch sprout a new branch,
> without having the revision in its ancestry just feels wrong.
> 
> If spawning were done in a different way, like doing:
> 
> branch2 = repo.create_branch(wt.branch.format, revision_id='rev3',
>                              path/bzrdir=??)
> That has you sprout a branch out of a repository, which is much more
> natural than having a branch create another branch, with an arbitrary
> revision from the *target* branch's repository.
> 
> Thoughts?

My thought is that if we go your route, we have to have two ways of
sprouting a branch, and we have to add new UI stuff to go along with the
new API.  If we just make sure Branch6 can do what Branch5 can already
do, we don't have to add new UI stuff.

We can always add new UI stuff later and deprecate the ability to branch
from a non-ancestral revision, but since it works now, and it's useful
functionality, let's put it under test.

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

iD8DBQFGYGjX0F+nu1YWqI0RAvyvAKCA2btBTN/KmbJgUO0KKgyUzlpg9QCfaEve
QfWj4KWwUYDpt8St7OJ07Kw=
=4Uys
-----END PGP SIGNATURE-----