Michael Sperber wrote:
That means the repo has changesets you don't have: You need to
pull
before you merge.
But I did; that's the point. I even rebased my change.
didier(s001)% hg pull
pulling from ssh://sperber-guest@hg.debian.org//hg/xemacs/xemacs
searching for changes
no changes found
didier(s001)% hg update
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
didier(s001)% hg push
pushing to ssh://sperber-guest@hg.debian.org//hg/xemacs/xemacs
searching for changes
abort: push creates new remote heads!
(did you forget to merge? use push -f to force)
zsh: exit 1 hg push
didier(s001)% hg glog | more
@ changeset: 5410:fda249e16819
| tag: tip
| user: Didier Verna <didier(a)lrde.epita.fr>
| date: Thu Mar 17 16:20:09 2011 +0100
| summary: Improve read-only error reporting.
|
o changeset: 5409:eac2e6bd5b2c
| user: Aidan Kehoe <kehoea(a)parhasard.net>
| date: Thu Mar 17 21:50:34 2011 +0000
| summary: Correct some minor problems in my last change.
--
Resistance is futile. You will be jazzimilated.
Scientific site:
http://www.lrde.epita.fr/~didier
Music (Jazz) site:
http://www.didierverna.com
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta