[DVC] Re: Re: Some XEmacs compilation fixes

[Matthieu Moy]

[ Cc-ing bzr's ml : this might show a usability problem ]

Neilen Marais <nmarais at sun.ac.za> writes:

> Matthieu,
>
> On Fri, 01 Sep 2006 12:58:43 +0200, Matthieu Moy wrote:
>
>> Bupdles appeared in bzr 0.9, so no surprise ...
>> 
>> Either upgrade bzr (recommanded, right now, we're following the
>> evolution of bzr, and not making efforts to support old versions), or
>> apply the bundle with "patch".	
>
> Thanks for the info. I upgraded to bzr 0.10, but now I get a different
> error:
>
> bzr: ERROR: Revision
> {stefan at xsteve.at-20060808185426-ae46cc064e417ad9}
> not present in inventory.
>
> How can I fix this one?

The bundle application needs to do exact patching (it's giving
delta-compressed representation of a revision based on another), you
can't apply it on a branch whose repository doesn't contain the base
revision.

In your case, I guess you need to "bzr pull" from Stefan before
applying the bundle.

On the bzr side, I wonder what could be made to make the error message
more user-friendly. Perhaps an additional "maybe you need to pull or
merge it" would help. At the moment, the error message is accurate and
sufficient for someone who understood the bzr model, but not for
beginners.

-- 
Matthieu