Re: Mercurial "r####" numbers are not stable, use commit ids
"Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
Michael Sperber writes:
> This seems to me *exactly* the way Mercurial would work. Where does it
> fall down?
I don't know how to do "reset" in Mercurial. Is there a way,
preserving changesets and branch inclusion relationships?
Could you elaborate on what "git reset" does? From the git user manual,
I think what you want is exactly:
hg update -C <rev>
... (possibly without the -C) but I don't know what that has to do with
"preserving" changesets, or how it implies a merge. From what I read in
the git manual, "reset" just affects the working tree, not the revision
history.
Ah, wait ... the man page says differently (and this is what drives me
nuts about the git doc). You want to retroactively undo a commit,
preserving the current working tree, right? This is done by "hg strip"
(part of MQ).
It would be nice to be able to protect the receiving repository from
inadvertant branch changes. If we can't do that, then the whole named
branch thing probably can't be done. If it is possible to move
commits from one branch to another, that might do the trick.
That's easy, albeit without preserving identity. Easiest is probably
with "hg transplant", but I suspect that "hg rebase" (which I
haven't
tried yet) also does this.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta