baz-import-branch: unexpected conflicts

[Aaron Bentley]

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

John Arbash Meinel wrote:
>> * error report
>> * Scanning for full-tree revision: ....
>> * from revision library (linking): ben at benfinney.id.au--bignose-2005/websites--mainline--0--patch-2
>> * Applying 2 revisions (in reverse): ..****************************************************
> 
> ^--- So this is actually what is causing problems. It is reverse
> applying the changes from patch-4 back to patch-2.

Actually, that means it has checked out patch-2, and then
reverse-applied patch-1 and base-0 to it.

> Looking at the first error more closely, you actually need to get the
> '--base-0' revision, not the patch-1. It might be a bug between base-0
> and patch-1 which is causing all of your problems.

That looks possible.  My mistake, for saying patch-1 instead of base-0.
 Been a while since baz days.

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

iD8DBQFE73Jg0F+nu1YWqI0RAjOkAJ9o7XVSIjdH4Sq37DWyw1S1anScxgCfYen1
6Os/evum8wiMaFYD4hH8fFE=
=nYYH
-----END PGP SIGNATURE-----