Bazaar

  1. Bug #244115
  2. Comment #3

Comment 3 for bug 244115

Revision history for this message
Aaron Bentley (abentley) wrote : Re: [Bug 244115] Re: merge between two branches fails

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

Robert Collins wrote:
> Its these lines here:
> Conflict adding files to libmokoui. Created directory.
> Conflict because libmokoui is not versioned, but has versioned children. Versioned directory.
>
> That I think show a bug - because both branches have libmokoui; even
> though the file ids conflict we shouldn't be seeing any unversioned
> directories.

It's behaving the way it was designed to work. I don't see that as a bug.

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

iD8DBQFIaRKu0F+nu1YWqI0RAtqDAJ9ykAEvcrjj6V+PdWtwe4ZUCoHvUACfXaIJ
/LLDIRXwj+gffsqR46hU78Q=
=lbO4
-----END PGP SIGNATURE-----