Bazaar

Error when using bzr pull

Asked by Lithin T

I took a bzr branch of openerp and one machine(A) and take a check out ro another machine(B),
I made some changes in the Machine(B) and commited the code, and took and update in Machine(A), after that when I try for bzr pull in the machine(A), I am getting an error as follows

Using saved parent location: http://bazaar.launchpad.net/ ~openerp/openerp-web/7.0/
bzr: ERROR: These branches have diverged. Use the missing command to see how.
Use the merge command to reconcile them.

when i tried bzr missing , I got

Using saved parent location: http://bazaar.launchpad.net/ ~openerp/openerp-web/7.0/
You have 1 extra revision:
--------------------------------------------------------- ---
revno: 4055
committer: lithint@en
branch nick: web
timestamp: Tue 2013-11-05 16:49:29 +0530
message:
theme changed for endosoft

You are missing 1 revision:
--------------------------------------------------------- ---
revno: 4055
fixes bug: https://launchpad.net/bugs/1195631
committer: Christophe Simonis <email address hidden>
branch nick: origin/7.0
timestamp: Tue 2013-11-05 13:18:43 +0100
message:
[FIX] web: instance.web.DataSetSearch.get_domain() retu rns the domain.

How can I solve this issue??

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
Vincent Ladeuil (vila) said : 		#1

Your branches have diverged, they share most of their history but disagree about the tips.

You should merge on into the other to reconcile them.

Revision history for this message
Lithin T (lithint-mail) said : 		#2

But how to merge it, can you plz guide me how to do it.

Revision history for this message
Vincent Ladeuil (vila) said : 		#3

First you have to decide which branch you want to merge into which one then:

  bzr merge <that other branch>

Resolve conflicts if any and:

  bzr commit -m 'Merge that other branch to get X and fix conflicts'

Can you help with this problem?

Provide an answer of your own, or ask Lithin T for more information if necessary.

To post a message you must log in.