Request: .. bzr: ERROR: Working tree [tree] has uncommitted changes (See bzr status)

Asked by ramsforums on 2012-06-20

Hello

I have downloaded repositories on my development PC from launch pad using the following command

   bzr branch lp:openobject-server/6.1 server

It worked and all latest source files on my PC

Last week I did an merge using the following command
   bzr merge

It worked well.

I am not making any changes to my working code. I typically use them that's all

Today I want to get the all latest changes from the repository I run the following command

 bzr merge

I have encountered the following err

 bzr: ERROR: Working tree [Actual tree here ] has uncommitted changes (See bzr status)

Is it a buy or I am making mistake?

Thank you

Question information

Language:
English Edit question
Status:
Solved
For:
Bazaar Explorer Edit question
Assignee:
No assignee Edit question
Solved by:
John A Meinel
Solved:
2012-06-21
Last query:
2012-06-21
Last reply:
2012-06-21
Best John A Meinel (jameinel) said : #1

In bzr 'merge' does not commit the changes. It gives you a chance to review
them, and then run "bzr commit". If you are not making any local changes,
you probably want to use "bzr pull" to stay up to date, rather than merge.

John
=:->
On Jun 21, 2012 12:56 AM, "ramsforums" <email address hidden>
wrote:

> New question #201033 on Bazaar Explorer:
> https://answers.launchpad.net/bzr-explorer/+question/201033
>
> Hello
>
> I have downloaded repositories on my development PC from launch pad
> using the following command
>
> bzr branch lp:openobject-server/6.1 server
>
> It worked and all latest source files on my PC
>
> Last week I did an merge using the following command
> bzr merge
>
> It worked well.
>
> I am not making any changes to my working code. I typically use them
> that's all
>
> Today I want to get the all latest changes from the repository I run the
> following command
>
> bzr merge
>
> I have encountered the following err
>
> bzr: ERROR: Working tree [Actual tree here ] has uncommitted changes
> (See bzr status)
>
>
> Is it a buy or I am making mistake?
>
> Thank you
>
> --
> You received this question notification because you are a member of
> Bazaar Explorer Developers, which is an answer contact for Bazaar
> Explorer.
>

ramsforums (ramsforums) said : #2

Thanks John for the explanation.

ramsforums (ramsforums) said : #3

Thanks John A Meinel, that solved my question.

Rafael Reuber (rafaelreuber-h) said : #4

Thank you John, that solved my problem too.