886823 - |hg heads| lists more than one head in the TBPL repo

Status: RESOLVED FIXED

(Tree Management Graveyard :: TBPL, defect)

Description

[Ed Morley [:emorley]]

$ hg heads
changeset:   1226:f3639f2c9462
tag:         tip
user:        Graeme McCutcheon <graememcc_firefox@<snip>>
date:        Fri Jun 21 08:56:08 2013 +0100
summary:     Bug 875323 - Remove redundant images. r=edmorley

changeset:   673:052258e7b517
branch:      production
user:        Cameron McCormack <cam@<snip>>
date:        Wed Jul 20 09:07:27 2011 +1200
summary:     Bug 659684 - Add a button (only on try) to cancel all jobs for a push. r=mstange

Comment 1

[Ed Morley [:emorley]]

$ hg merge
abort: nothing to merge

[ie: the old production branch had already been merged; no outstanding changesets]

$ hg up production
27 files updated, 0 files merged, 87 files removed, 0 files unresolved

$ hg commit --close-branch -m "Bug 886823 - Close production branch since it's no longer used"
committed changeset 1227:a7f934d038be

$ hg up default
109 files updated, 0 files merged, 5 files removed, 0 files unresolved

$ hg merge production
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)

$ hg commit -m "Bug 886823 - Merge branch closure to default, to leave just one open head"
committed changeset 1228:62347496eda9

$ hg heads
changeset:   1228:62347496eda9
tag:         tip
parent:      1226:f3639f2c9462
parent:      1227:a7f934d038be
user:        Ed Morley <emorley@[snip]>
date:        Tue Jun 25 16:05:54 2013 +0100
summary:     Bug 886823 - Merge branch closure to default, to leave just one open head