bzr confused about log after doing update

Alexander Belchenko bialix at
Thu Feb 26 14:00:33 GMT 2009

Daniel Lidström пишет:
>> 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 tried bzr ci --local, which cleared up the pending merge.
> The log says no files were modified, so everything seems to be OK.

You can clear pending merges by command:

bzr revert --forget-merges

In this case yiou don't need to ci --local

More information about the bazaar mailing list