Bzr merge problem

[Trent Johnson]

Trent Johnson <Trent.Johnson <at> jasco.com> writes:

I ran bzr missing ..\trunk from within the feature branch to get the following 
if it is helpful:

You have 4 extra revision(s):
------------------------------------------------------------
revno: 275
committer: briand <briand at BRIANDG-LP>
branch nick: bug678
timestamp: Thu 2010-12-16 16:20:36 -0400
message:
  Turned off function graph in SP
------------------------------------------------------------
revno: 274
committer: briand <briand at BRIANDG-LP>
branch nick: bug678
timestamp: Thu 2010-12-16 15:03:26 -0400
message:
  Final commit before merge with trunk
------------------------------------------------------------
revno: 273
committer: briand <briand at BRIANDG-LP>
branch nick: bug678
timestamp: Thu 2010-12-16 09:15:32 -0400
message:
  Interim commit
------------------------------------------------------------
revno: 272
committer: briand <briand at BRIANDG-LP>
branch nick: bug678
timestamp: Fri 2010-12-10 13:27:55 -0400
message:
  Reverted FullProcessing back to the previous processing structure



You are missing 6 revision(s):
------------------------------------------------------------
revno: 279
committer: Vignesh<vignesh at jasco.com>
branch nick: trunk
timestamp: Thu 2010-12-16 17:07:56 -0400
message:
  Reverted pom to development version 3.5-SNAPSHOT
------------------------------------------------------------
revno: 278 [merge]
fixes bug(s): https://halifax.jasco.com/bugzilla/show_bug.cgi?id=727
committer: Vignesh<vignesh at jasco.com>
branch nick: trunk
timestamp: Thu 2010-12-16 17:06:50 -0400
message:
  Merged bug branch 727 and version now up to 3.4.3
------------------------------------------------------------
revno: 277
committer: Vignesh<vignesh at jasco.com>
branch nick: trunk
timestamp: Wed 2010-12-15 02:46:54 -0400
message:
  Reverted pom to development version 3.5-SNAPSHOT
------------------------------------------------------------
revno: 276 [merge]
fixes bug(s): https://halifax.jasco.com/bugzilla/show_bug.cgi?id=716
committer: Vignesh<vignesh at jasco.com>
branch nick: trunk
timestamp: Wed 2010-12-15 02:46:00 -0400
message:
  Merged bug branch 716 and version now up to 3.4.2
------------------------------------------------------------
revno: 275
committer: trent <trent at jasco.com>
branch nick: trunk
timestamp: Thu 2010-12-09 08:40:10 -0400
message:
  Reverting back to revision 273, the repo revision immediately after 
version3.4.1 tag.
------------------------------------------------------------
revno: 274 [merge]
committer: briand <briand at BRIANDG-LP>
branch nick: aa-trunk
timestamp: Tue 2010-12-07 11:48:30 -0400
message:
  Commit after merge with bug678