Weird failure of a merge to local branch

[Eli Zaretskii]

> Date: Mon, 06 Dec 2010 22:44:22 +0200
> From: Eli Zaretskii <eliz at gnu.org>
> Cc: bazaar at lists.canonical.com
> 
> > Date: Mon, 06 Dec 2010 09:57:47 -0500
> > From: Aaron Bentley <aaron at aaronbentley.com>
> > 
> > >  . Revert to the revision before the merge, and try "bzr merge" again
> > >    (same question)
> > 
> > 
> > Yes, after deleting the pending-deletion directory.
> 
> Thanks, that worked

Sorry, I spoke too soon, because after doing the above and resolving
the 4 text conflicts, "bzr status" still says that working tree is out
of date and suggest to run "bzr update".  It also shows a pending
merge tip.  I think it means that this branch diverged from its
parent, which is not what I want (this branch is supposed to be a
perfect replica of its parent, because I always merge any changes I
make in it back to the parent).

What did I miss?

If there are no better ideas, I would tend to "bzr update -r" to some
old revision which I know was in sync with the parent, then do the
same "bzr merge --pull" again from the parent to get this branch in
sync.  Would that DTRT?

TIA