Text conflict did not create .BASE file - is that expected?

[John Arbash Meinel]

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

On 3/28/2011 12:08 PM, Nicholas Allen wrote:
> Hi,
> 
> I just tried to merge a branch into my branch. Bazaar warned me that a
> criss cross merge was encountered and I received text conflicts. For one
> of the files Bazaar created the .OTHER and .THIS files but not the .BASE
> file. Bazaar shows that file as having a "Text conflict".
> 
> Is that a bug or is there some reason for that?
> 
> Cheers,
> 
> Nick
> 

https://bugs.launchpad.net/bzr/+bug/494197

Known bug. Analysis is in the bug page if you want the gory details.
Basically, criss-cross can drive the default BASE back far enough that
the file doesn't exist.

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

iEYEARECAAYFAk2Qa+wACgkQJdeBCYSNAAMhSgCguOTTb7+ESA/QK1szYkSMZ7Hn
KhcAn2wGIy9uF/iDYD5tigsXvBJXfNwN
=i3zf
-----END PGP SIGNATURE-----