[RFC] .bzrconfig directory

Aaron Bentley aaron at aaronbentley.com
Thu May 22 06:06:27 BST 2008


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

Ian Clatworthy wrote:
> Aaron Bentley wrote:
>> If we have a .bzrconfig directory, I would want it to exist whether or
>> not a working tree is present, even though it would be a versioned file
>> if the working tree was present.  Implementing that could get kinda ugly.
> 
> Can you explain further? I agree that a shared-repo or treeless-branch
> *might* have this file - it wouldn't only apply to working trees. Not sure
> I grok all the implications of that though.

Well, if the file is versioned, that means that some operations will
want to create it, and other operations will want to delete it.

So let's say we have Branch A and Branch B, a mirror.

Branch B is a mirror of branch A.

We upgrade branch B to $NEW_FORMAT.  It gains a .bzrconfig directory,
but this is not a versioned directory-- format upgrades shouldn't change
logical working tree contents.

Now we upgrade branch A to $NEW_FORMAT.  It gains a .bzrconfig
directory, presumably unversioned.  Now we do some operation that causes
it to be versioned, and commit.

When we pull in branch B, it will try to create a .bzrconfig directory,
which will cause a conflict and rename the existing directory to
.bzrconfig.moved.

After we've fixed the conflict, if we revert to the previous revision,
it will want to delete the directory.

That's the sort of thing I meant.

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

iD8DBQFINP9T0F+nu1YWqI0RAvRdAJ4rUsavsCHQthFnHaCCMQ/vnHHvQwCfQ1+c
HNvcCeHpxXZONHPA1VN2GwM=
=pYlM
-----END PGP SIGNATURE-----



More information about the bazaar mailing list