Danek - I have merged as you suggested to 1917 from tip with the comment
"merge accidental branch". Its odd that Padraig was able to do this, the
gate always blocked this behavior.
JR
On 05/26/10 03:06 PM, Padraig O Briain wrote:
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
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
