[MERGE][0.14] Allow 'bzr push' to push onto existing dir

[Alexander Belchenko]

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

John Arbash Meinel пишет:
> Robert Collins wrote:
>> Robert Collins has voted +1 (conditional).
>> Status is now: Conditionally approved
>> Comment:
>> I think perhaps that alexanders error indicates a bug though - it may be
>> that --use-existing prevents the code path for reuse of a bzrdir control
>> dir working correctly - or may be in the wrong order.
>>
> 
> I can reproduce Alexander's problem if I do:
> 
> mkdir -p ~/tmp/test-push/.bzr
> ../bzr push --use-existing ~/tmp/test-push/
> 
> Because there is a '.bzr' directory, but there isn't a valid BzrDir
> there. (BzrDirFormat.initialize() expects to be able to create the .bzr
> directory)
> 
> I'm thinking 3 things
> 
> 1) If the target directory has a .bzr but we can't understand it, I
> really don't want to continue. If we can't even read the
> ..bzr/branch-format file, it really is an unknown. So I have the feeling
> it is correct to error out.

For me is better to have the way to continue anyway.
Probably with --force (or --nuke) flag.

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

iD8DBQFFyjxSzYr338mxwCURAnt8AJ9fEkmiwmDPto0XXIMUjnCvKgr9pwCcDHAD
tWNlm+c3UQflUmkZ6yfiIh0=
=DfhZ
-----END PGP SIGNATURE-----