[MERGE] Checkout into existing trees works

[Aaron Bentley]

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

John Arbash Meinel wrote:
> John Arbash Meinel has voted approve.
> Status is now: Approved
> Comment:
> I think it was actually a case of us actually wanting to prevent it.

Well, originally, there was no conflict resolution, so it would throw a
MalformedTransform if there were existing files.  But also, the command
was created before Branch.create_checkout (or ensure_base), so it had to
do everything by hand.

> Because we felt that checking out into an existing directory was a bad
> idea. (And usually meant someone had a typo, like doing:
> cd base
> bzr checkout subdir
> )
> 
> Have you checked what sort of error that will produce?

I don't think it will produce any error, unless there is already a
working tree.  In which case, we get

bzr: ERROR: File exists:
u'/home/abentley/.bazaar/plugins/bzrtools/.bzr': [Errno 17] File exists:
'/home/abentley/.bazaar/plugins/bzrtools/.bzr'

Perhaps we should make that nicer, but that's really a bug in
BzrDir.initialize_on_transport

> So I'm okay with your changes. You should probably wait until tomorrow
> to merge in case someone else has a different viewpoint.

Okay.

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

iD8DBQFGw0At0F+nu1YWqI0RAmAtAJ960snSZk5YTSAhwR8YjNEvxcExxgCfevt+
vdLYHwLhe5YI2NDZdnWrtqc=
=ZxqS
-----END PGP SIGNATURE-----