Bazaar

  1. Bug #484706
  2. Comment #3

Comment 3 for bug 484706

Revision history for this message
John A Meinel (jameinel) wrote : Re: [Bug 484706] Re: merge 2 unrelated branches in rich-root format cause path conflict for the same file-id

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

Alexander Belchenko wrote:
> See attached Makefile to easily reproduce the problem for different
> formats.
>
> make FORMAT=pack-0.92 -> works OK
>
> make FORMAT=rich-root-pack -> produce path conflict
>
> ** Summary changed:

Quick guess-

rich-root-pack creates a special file-id for the tree root, which is not
propagated via --file-ids-from. If you do 'init + commit + add + commit'
then I don't think we can. But if the add is the first thing, and you
haven't done anything else, then the root id probably hasn't been set
yet, so it is probably possible.

 importance: low

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAksED80ACgkQJdeBCYSNAANyGgCeMk6jGmcM5NmhR8WgnH0Mkvog
fUAAn3nOjvhDEymvSr90G18Hog/NUAx8
=7I2W
-----END PGP SIGNATURE-----