New changesets on a closed branch that must make it to default

[Wujek Srujek]

Hi. We have the following case today: we have a (named) feature branch, and
one of us merged some changes from default:
(on 'feature_x')
hg merge default
hg ci -m 'Merges default'
hg push

Meanwhile, someone else closed and merged 'feature_x' into default
(locally):
(on 'feature_x')
hg ci --close-branch -m 'Closing feature branch'
hg up default
hg merge feature_x
hg ci -m 'Merges feature x'
hg push

push fails. So, the 'closing person' pulls, and now has a new changeset
(the merge with default) on the branch he closed already, and didn't know
what to do. What we did was that we closed the 'feature_x' branch again,
merged it into default, and pushed. hg then issued a warning that we are
pushing a new commit to an already closed branch, which we fixed with the
-f switch. The repository looks good afterwards.

The question is: how does one deal with such use cases? Is what we did
right in these circumstances? Agreed, we failed at communication at some
point, but this happens.

Regards,
wujek
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20120224/b13d7129/attachment-0002.html>