Bzr merge problem

[Trent Johnson]

Hi

I am trying to get a feature branch merged into our product's development trunk.

About a week ago a developer decided to merge his (incomplete) work into trunk, first he merged trunk with his branch (bug678) to get it up-to-date (trunk revision 273). Then the developer merged his feature branch with trunk (to create trunk revision 274).

As the product manager, after a review of the work, I decided to revert the trunk back to the previous revision (revision 273) to get revision 275.

I used:
bzr revert -r273

The developer continued working on his feature branch, trunk received commits from other developers (now up to revision 279).

The developer is now truly ready to merge and commit his feature branch with trunk.
He performed a merge with trunk from within his feature branch:
bzr merge ../trunk

And received tuns of changes and conflicts. Many more than the simply changes that occurred between his previous merge of trunk and the HEAD of trunk.

How should he merge trunk back into his feature branch before merging his changes with trunk?

Thanks,
Trent


Trent Johnson, P.Eng.
Senior Systems Engineer,
Software Engineering Manager
___________________
JASCO APPLIED SCIENCES
432 - 1496 Lower Water Street
Halifax,  NS,  Canada,  B3J 1R9
T. +1.902.405.3336 ex. 1019
F. +1.902.405.3337
C. +1.902.430.0394
www.jasco.com<http://www.jasco.com/>

ANNOUNCEMENT
We're moving! As of 17 January 2011, the Eastern Canadian section of JASCO Research Ltd, operating as JASCO Applied Sciences, will be relocating our office (432 - 1496 Lower Water Str.) and warehouse facility (18 - 10 Akerley Blvd.) to a new joint location at: 32 Troop Ave, Dartmouth, NS  B3B 1Z1; T: (902) 405-3336; F: (902) 405-3337. We look forward to working with you from our new location.

CONFIDENTIALITY NOTICE
This email and any files transmitted with it contains proprietary information and, unless expressly stated otherwise, all contents and attachments are confidential. This email is intended for the addressee(s) only and access by anyone else is unauthorized.
P Please consider the environment before printing this e-mail.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20101216/d19988ed/attachment.htm