On 05/26/10 02:59 PM, Danek Duvall wrote:
Padraig O Briain wrote:
I seem to have created two heads with my latest putback.
How can I undo this damage?
You can't. Mercurial should have prevented you from pushing when it would
have created an extra head, but for some reason it didn't. I don't suppose
you have an alias in your .hgrc to make "push" map to "push -f"? If not,
then I'll have to dig around and figure out what might have happened.
No. I have attached my ~/.hgrc.
You should update to tip (1918), merge with the previous revision (1917),
commit the merge (comment can be "merge accidental branch" or some such)
and push the merge changeset.
Danek
[extensions]
hgext.hgk =
hgext.graphlog =
[hgk]
path=/usr/demo/mercurial/hgk
[ui]
username = Padraig O'Briain <[email protected]>
[paths]
default = ssh://[email protected]/hg/pkg/gate
default-push = ssh://[email protected]/hg/pkg/gate
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
