Corrupt branch?

[David Muir]

This is starting to get really frustrating...
Why is it that this problem only occurs with the new 2a format?
My old setup using the old rich-roots format is able to diff without any 
problems.

Also, I'm now having the following issue:

Using 2a:
/staging$ bzr merge ../trunk
bzr: ERROR: Revisions have no common ancestor: 
dmuir at tekika.com-20090824121713-bzbsdhxmeucwj8mn 
dmuir at tekika.com-20091109082015-cxl7kzen79iavty5

Using old rich-roots
/staging$ bzr merge ../trunk
....list of merged files.....


Looks like I'm going to have to just avoid 2a for the time being...

David


John Arbash Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> David Muir wrote:
>   
>> Neil Martinsen-Burrell wrote:
>>     
>>> On 2009-11-06 09:04 , David Muir wrote:
>>>       
>>>> I've already filed a bug, but figured I'd post here to see if anyone has
>>>> a quick fix.
>>>>
>>>> When I run `bzr diff`, I get
>>>>
>>>> bzr: ERROR: bzrlib.errors.NoSuchRevision:
>>>> CHKInventoryRepository('file:///home/dmuir/www/book_dev/.bzr/repository/'
>>>> <file:///home/dmuir/www/book_dev/.bzr/repository/%27>)
>>>> has no revision dmuir at tekika.com-20091102141011-fczx82vwvpt5x7h9
>>>>
>>>> Seems that most other commands work fine including commit and uncommit.
>>>>
>>>> https://bugs.launchpad.net/bzr/+bug/476392
>>>>
>>>> Hope someone can help.
>>>>         
>
> I'm pretty sure you are running into:
> https://bugs.edge.launchpad.net/bzr/+bug/393837
>
> "diff" can't handle ghost revisions.
>
> You can at least track the issue there.
>
> John
> =:->
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.9 (Cygwin)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>
> iEYEARECAAYFAkr1nGIACgkQJdeBCYSNAAPS5ACg00rDpOogBgEfeNuT+2V+EAuc
> az0AoJgwqa1t5+SrO+Jgyz21Fx6dRSpr
> =lZZM
> -----END PGP SIGNATURE-----
>   

-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20091110/50fc0f9c/attachment.htm