bzr confused about log after doing update

[Alexander Belchenko]

I guess there was merge at svn side and after update bzr-svn try to 
emulate it at bzr side. May be Jelmer can shed some light here?

Daniel Lidström пишет:
> Hello,
> 
> I am using bzr to checkout a subversion tree. Yesterday, after doing bzr up
> in my non-modified local tree, bzr shows this status:
> 
> C:\Users\Daniel.SBG\Programming\projects\nautilus_2009_01-repo\nautilus_2009
> _01-trunk>bzr st
> pending merge tips: (use -v to see all merge revisions)
>   niklasd 2009-01-27 [NAUT-44]Added possibility to change the elevation on a
> GftLine as well.
> 
> This got me confused. What does 'pending merge tips' mean? I was determined
> to know, so I used
> qlog and TortoiseSVN to compare what has happened. The attached screenshots
> show them.
> 
> Nobody else is using bzr, only me. Everybody else is using TortoiseSVN. What
> do I do now? I am
> about to merge my private branch with nautilus_2009_01-trunk, but I don't
> want to do that as long
> as the status shows 'pending merge'.
> 
> Thanks in advance!
> 
> For the record:
> 
> C:\Users\Daniel.SBG\Programming\projects\nautilus_2009_01-repo\nautilus_2009
> _01-trunk>bzr --version
> Bazaar (bzr) 1.12
>   Python interpreter: C:\Program Files\Bazaar\python25.dll 2.5.2
>   Python standard library: C:\Program Files\Bazaar\lib\library.zip
>   bzrlib: C:\Program Files\Bazaar\lib\library.zip\bzrlib
>   Bazaar configuration: C:\Users\Daniel.SBG\AppData\Roaming\bazaar\2.0
>   Bazaar log file: C:\Users\Daniel.SBG\Documents\.bzr.log
> 
> Regards,
> 
> Daniel Lidström
> Stockholm, Sweden 
>