Re: HG help please
Didier Verna <didier(a)xemacs.org> writes:
So, apparently, I'm an HG dummy.
I want to push a change of mine that I just committed locally on top of
the most recent pull:
[...]
didier(s001)% hg merge
abort: branch 'default' has one head - please merge with an explicit rev
(run 'hg heads' to see all heads)
That means the repo has changesets you don't have: You need to pull
before you merge.
didier(s001)% hg glog | less
＠ changeset: 5405:9e15f69c9d20
| 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: 5404:6c3a695f54f5
| user: Aidan Kehoe <kehoea(a)parhasard.net>
| date: Mon Mar 14 21:04:45 2011 +0000
| summary: Update png_instantiate () to work with more recent versions of libpng.
Indeed, Aidan has pushed a couple of changesets since this one.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta