baz-import does not record Arch merges

Aaron Bentley aaron.bentley at utoronto.ca
Fri Nov 11 16:34:51 GMT 2005


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


John A Meinel wrote:
| I was surprised, though, to look at the revision-store files for these
| revisions, and only see a single parent for all of them. Because I knew
| I was merging from the other branch.

There are some branches of baz-import that do support merge metadata.
It's just that Robert and I haven't quite got everything synced up. You
can check out

http://panoramicfeedback.com/opensource/bzr/bzrtools-baz2bzr/
and
http://people.ubuntu.com/~robertc/baz2.0/bzrtools-baz2bzr/

Robert's branch supports some of his unmerged bzrlib changes.

| Also, I understand the desire to use the revision identifier
| "Arch:archive at somewhere/cat--branch--0.1--patch-10", however, on
| Windows, the colon (:) is an illegal character in filenames.

Doh!

| Which to me seems that we need a different translation for arch revision
| ids. I realize this is coming a little bit late, since most of launchpad
| would be converted to using bzr instead of baz, meaning there are a
| whole lot of revision ids out there with a colon in them.

Well, we were planning on bumping the namespace again when Robert's
changes got merged in, so maybe we'll format them differently.

|
| The other possibility is to leave the revision identifier the way it is
| (colon is nice from a logical perspective), and just to have the stores
| know to look for the file under a different name. We could smash it to
| underscore, or replace it with something else.

Martin's been reluctant to encode the IDs, but the only forbidden
characters so far were '/' and maybe '\'.

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

iD8DBQFDdMgr0F+nu1YWqI0RApKGAJ9F4L5/RbHec+yWWmQn6YVf3T1KagCeO9fw
TH2Owgs/vsR3yEgh4sk1evg=
=WDju
-----END PGP SIGNATURE-----




More information about the bazaar mailing list