[BUG] cannot merge bundle if standalone branch was in shared repo

Alexander Belchenko bialix at ukr.net
Fri Jun 16 19:52:05 BST 2006


John Arbash Meinel пишет:
> Alexander Belchenko wrote:
>> I cannot merge bundle patch if I try to merge to standalone branch while
>> bundle source is (or was) in shared repository.
>>
>> I make bundle-revisions for the BASE:
>>
>> BRANCH> bzr bundle /PATH/TO/BASE --output=bundle.patch
>>
>> Then I want to merge this bundle
> 
> This actually looks like your trees are disagreeing on what the correct
> inventory text is. Which isn't because of a repository vs standalone,
> but because there is an actual disagreement.
> 
>> PATH/TO/BASE> bzr merge bundle.patch
>> bzr: WARNING: Inventory sha hash mismatch for revision
>> bialix at ukr.net-20060616045349-a5296e9401d2e6d3. f29aaec762291b1ac04f50f68
>> 2f226bc888b3255 != f706ca021038f5c240ca8231d2f7df6f9c983b54
>> bzr: ERROR: Testament did not match expected value.
>>        For revision_id {bialix at ukr.net-20060616045349-a5296e9401d2e6d3},
>> expected {f843ee2b51d9e26cf0fa7c59154bc420749dcdde}, me
>> asured
>>        {54b9467567f45b0040adc6b97200aa712f9c4243}
>>

I don't understand this error message. When I run command 'testament' in 
different derived branches I've got this info:

$ bzr testament -r revid:bialix at ukr.net-20060616045349-a5296e9401d2e6d3
bazaar-ng testament short form 1
revision-id: bialix at ukr.net-20060616045349-a5296e9401d2e6d3
sha1: 3c5b0054a8366f6ce856e17ec39422728dedd161

Printed sha-1 does not match any number in error message. How I can 
debug this problem? What I need to inspect?

--
Alexander





More information about the bazaar mailing list