Comment 8 for bug 307554

Revision history for this message
John A Meinel (jameinel) wrote : Re: [RFC] branching into existing directory fails

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

...

>>> Maybe I'm thinking about htis too simply, but it seems to me that the
>>> only
>>> check which needs to be performed on the target filesystem when creating
>>> a
>>> new (non-shared) branch is to make sure the target directory does not
>>> already have a .bzr repository. (Trying to create a shared repo on top
>>> of
>>> an existing branch (shared or non-shared) needs to be prevented, right?)
>> You're right that we should be careful about the case where there's
>> already a .bzr directory. I think we should also be careful about the
>> case where there's non-bzr content - if you then create a working tree
>> there, presumably it'll have to merge with those files. (I guess it
>> would be a two-way merge with no common base.) It's quite possible
>> this would sometimes be useful, when the directory you're extracting
>> into contains a slightly modified version of the tree you're
>> extracting, perhaps from a tarball or maintained outside of vcs.
>> However, it would sometimes be confusing and it would take some care
>> that we actually do the merge in a reasonable way. (I think at the
>> moment bzr branch just builds the tree regardless of what's there.)
>> So extracting into a non-empty directory I would split off into a
>> separate bug.

I believe that "bzr checkout ." and "bzr checkout $URL ." already handle
these cases, so it shouldn't be particularly harder for "bzr branch" to
do so.

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

iEYEARECAAYFAkpENfoACgkQJdeBCYSNAAMycQCfQRApVXWPsuf7Pzdb4dN+EJn2
KWIAoLSFwrwzr3o1GluZysX3ylY7vZzA
=Nx5S
-----END PGP SIGNATURE-----