Re: [glob2-devel] Update: Core Rewrite *Important, Steph really upset*

[Kai Antweiler]

> Ok, i've tried to undo the changes more permamently. I double checked
> to make sure i wouldn't revert past anyone elses changes, then i used
> revert to revert back to before my changes,

Weird "hg revert --all -r <xyz>" should have reset your parent to <xyz>.
Anyhow your idea to get rid of multiple master branches, is not necessary.
Only the most recent one must be the "true" master branch.
Just pull the remote master into your local master and use "hg update" or
"hg update -C" afterwards.
And maybe "hg branch" to check if the branch name is correct.

> then I used commit and
> push to put them back on the server. I've seperated out my branch from
> the master, so further commits should be fine. Sorry for the fuss.

Yes, your "core_rewrite_2007" branch looks fine.

--
Kai Antweiler