Comment 3 for bug 240762

Revision history for this message
Daniel Hahler (blueyed) wrote : Re: [Bug 240762] Re: "bzr merge --preview --force" fails with "exceptions.AttributeError: children"

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

> If I was guessing, I would actually say a directory became a symlink.

Yes.

In the target branch (where I wanted to merge into), a directory has
been changed into a symlink.

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

iD8DBQFIWXeifAK/hT/mPgARAuFvAJ9ygzhVJhVwV8YAQpxarYoqceUrVwCfSMnv
N766uHk7U2jTnl7wv2P2sk0=
=Rip9
-----END PGP SIGNATURE-----