Branch fails from 'pack-0.92' repo to 'rich-root-pack' repo
Aaron Bentley
aaron at aaronbentley.com
Sun Apr 20 13:58:04 BST 2008
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Ben Finney wrote:
> Aaron Bentley <aaron at aaronbentley.com> writes:
> This is a
> freshly-created repository, explicitly created for this test case.
Ah. I was assuming the problem was due to pre-existing data in your
repository, so I wouldn't be able to reproduce it.
>> That command works fine for me, but I am not creating the branch in
>> a shared repo.
>
> That's pretty much the point of my exercise: I'm trying to use shared
> repositories, and they keep breaking in unexpected ways.
>
> Are you able to reproduce the failure I get, following the case given
> at the start of this thread?
Yes. I'm sorry I didn't read more carefully before giving my previous
reply.
I created Bugs Everywhere with a development version of bzr, and its
tree root is unique, unlike normal pack-0.92 trees. The converter does
not handle these rare halfway-rich branches correctly yet. I hope to
work on that this week. No released version of Bazaar ever created such
branches.
On the other hand, you shouldn't be pulling Bugs Everywhere (or Bazaar
itself) into rich-root-pack format. If you do, any new commits you make
will be incompatible with the upstream repository, so they won't be
mergeable. Also, pull from pack-0.92 into rich-root-pack is slower than
pull from pack-0.92 into pack-0.92.
>> You may need to run "bzr reconcile" on your shared repo > first.
>
> Under what circumstances would that need to be done?
When you have an old repository that you have upgraded from another
format, especially if development versions of bzr were used on it. You
can run "bzr check" to see if you need to run reconcile, but IME, this
takes as long as reconcile itself.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFICz3b0F+nu1YWqI0RAiw/AJ98PIj5GgpRQmGLsR+Mj4Xz4vYtUgCdFhhv
pQcRe0yWBm7OVJ/Mp9gKfc0=
=VtQI
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list