Re: [ISSUE SOLVED] Re: bazaar

["Vladimir 'φ-coder/phcoder' Serbinenko" <phcoder@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 890 bytes --]

Robert Millan wrote:
> On Mon, Nov 23, 2009 at 02:40:28AM +0100, Vladimir 'φ-coder/phcoder' Serbinenko wrote:
>   
>> I managed to unmerge our mainstream by using raw revid (visible with bzr
>> log -n0 --show-ids) by
>> bzr branch -r revid:<..revid..> mainline mainline-real
>> If you comitted recently please check if nothing is missing
>> Carles: check your locations in
>> .bzr/branch/branch.conf
>>     
>
> Thanks Vladimir.  Btw, there's also "bzr uncommit".
>
>   
Probably wouldn't have helped. Trunk was replaced by Carles' branch and
original trunk was available only as a merge into this branch
> Carles, can you explain the sequence of commands you used for this to happen?
> I think I told you yesterday not to use "bzr push", and I can't think of
> another way that would lead to this.
>
>   


-- 
Regards
Vladimir 'φ-coder/phcoder' Serbinenko



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 293 bytes --]