Joining unrelated branches

[Aaron Bentley]

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

Francois Deppierraz wrote:
> Aaron Bentley wrote:
> 
>> What you did wrong is you merged into a branch with no commits.  That
>> doesn't work in Bazaar.
> 
> I'm not sure this is the actual problem.

That is why he got "working tree is out of date, run 'bzr update'",
which led him further astray.

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

iD8DBQFIdNex0F+nu1YWqI0RArELAJ9oA2rVD21qmWsJTShakOuTxG/RowCfeLgP
T1WU5zfaswTKeEp8N2W7l44=
=6Qhs
-----END PGP SIGNATURE-----