bazaar/mercurial meeting

[Aaron Bentley]

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

John Arbash Meinel wrote:
| Aaron Bentley wrote:
|
| I didn't realize that hg had repositories. Though I guess I just found
| out that with 'clone -U' you can prevent it from 'updating the working
| directory' ie, don't create a working dir.

This is that "multi-head" thing people kept talking about, with a
working tree that had several branches in it.  It sounded crackful in
those terms, but in Bzr terms, it's a repository with a working tree at
its root.

|>Any kind of merger would be challenging, but there would definitely be
|>advantages:

| Yeah. The only problem is the semi-fundamental model differences. hg
| follows the svn model of copy + delete rather than rename, and doesn't
| use the concept of individual ids per file. (Hence probably has
| difficulty with merging after renames).

Bzr can handle such a format though: as long as they have unique
revision IDs, we can synthesize file ids, and convert delete+copy into
rename.

| On the flip side, it supports
| copying history, so that you can 'split' a file, and still retain the
| ancestry for each line.

Unfortunately, no one's come up with sane semantics for merging with
copied files, so far as I know.

| If it wasn't for that, I was curious if we could have actually used hg's
| storage. (It would be slow for annotations, but is obviously fast for
| other things).

We actually did have a revfile implementation in our source tree, at one
point, so it's something we've looked at.  Knits are a kind of
weave/revfile hybrid, so I believe they could be competitive with revfiles.

| I'm not sure how much we can actually merge versus just having a good
| exchange of ideas between the two projects. But I would agree, if a
| merge is possible, it could provide a lot of great benefits.

Well, it might be nice to grab their smart server, for example.

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

iD8DBQFEceR60F+nu1YWqI0RArQVAJ9Gg5LME2eeTI3ufPLCvwkjUctn9wCdEWHc
imELuEVMv3Qvsk4OT1CHM8s=
=7alF
-----END PGP SIGNATURE-----