Re: Need help for a hg push
Norbert Koch writes:
* Michael Sperber <sperber(a)deinprogramm.de>:
> > I'm getting confused. I'm pretty sure I've pulled and updated
> > everything before I made my changes, simply because I don't want - and
> > normally need - to merge. As Steve has already noted, I'm reacting on
> > input from the developers.
>
> You did, but Aidan did not. :-)
So, what's the way out of this?
I suggest
# cleaner, but Aidan needs to strip that commit too (may be too late)
hg update <Aidan's head>
hg strip
hg update <your head>
hg push
or
# won't really hurt anything and doesn't require a fixup in Aidan's
workspace
hg update <your head>
hg merge <Aidan's head>
hg push
In either case, you should then check to make sure that the packages
you make in leim, ruby-modes, and cc-mode are actually different from
before. ruby-modes and cc-modes are OK, I think, but as I posted
earlier, Aidan's commit seems to be completely empty.
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta