baz-import-branch: unexpected conflicts

[Aaron Bentley]

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

Ben Finney wrote:
> For the purpose of getting what I wanted, that's a viable
> workaround. Does anyone want me to diagnose further?

Unfortunately, that's expected behavior.

tla and derivatives behave somewhat inconsistently in these
circumstances.  I've written Python code that applies Arch changesets,
and it's shown that most archives  (e.g. the tla and baz codebases) do
have inconsistencies like this.

In fact, all tag revisions have flawed changesets.

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

iD8DBQFE8LUJ0F+nu1YWqI0RAs8dAJ4w9mW5z3v6n6lQcXgTMZXlZLAtywCfaJ0m
HuL36CeuNUxNU9CGwfntatY=
=/23i
-----END PGP SIGNATURE-----