baz-import does not record Arch merges

[John A Meinel]

I just ran a "bzr baz-import" for a couple of branches of mine, where I
would continually merge them back and forth.
Specifically, one of them was where I did my development work, and the
other one was my CVS gateway. (I would manually cvs update, tla commit,
or tla star-merge and cvs commit).

I converted the first branch. Which I'm happy to say worked. In the past
it would fail, but all the bugs seem worked out.
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.
I figured I was just missing something, so I converted the CVS branch as
well.
Then when I went to "cd proj-CVS.bzr; bzr merge ../proj.bzr" it churned
for a while, and then decided that there were no text changes, but that
it had to add all of the ancestry as "pending-merges".


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.

http://www.grouplogic.com/Knowledge/index.cfm?fuseaction=view&docID=111

According to that same site, the colon is also illegal under MacOSX. I
found that I was able to create a file with a colon on the command line,
but when I tried to do so in the Finder, it did not work.

What is really freaky, is that when I use a colon, it shows up in finder
using a forward slash. And when I change the name of something in the
finder to use a forward slash, I get a colon. (Right now I have a file
"foo/a" in finder, and "foo:a" according to ls).

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.

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.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051111/dbd89d0f/attachment.pgp