I'm wondering if the clean that Ben is using
hg update -C @
is something that shouldn't be done with bookmarks. I think what might
have happened is that Ben updated his repository and working copy to the
latest. Made some changes and pushed that. But in between someone might
have pushed some items and moved the @ bookmark. (Or an equally
plausible scenario is that Ben pulled from the repository when the
bookmark wasn't pointing at the most recent code.) Perhaps somehow the
-C clean is detaching Ben's @ bookmark from the @ bookmark in the
default branch (which has been repositioned). Hence the complaint:
divergent bookmark @ stored as @default
I wonder if without the -C option mercurial would have successfully
tracked the bookmark movement, merged then discard the temporary branch.