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 re
On Mon, Nov 23, 2009 at 10:59:34AM +0100, Carles Pina i Estany wrote:
>
> bzr checkout of trunk (fresh checkout)
> 1.- cd grub
> 2.- bzr merge sftp://. people/carles/gettext (as I understood from you
> in IRC)
These two by themselves don't modify the remote tree (you'd need bzr commit)
> Aft
Hi,
On Nov/23/2009, 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
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
Btw with "mainstream" and "mainline", I assume you re
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
Vladimir 'φ-coder/phcoder' Serbinenko wrote:
> Carles Pina i Estany wrote:
>
>> Hello,
>>
>> I have to go to sleep now, but I've realized about a mistake or at least
>> unexpected behaviour.
>>
>> After merging trunk with people/carles/gettext as Robert said I have been
>> committing and pushing
