From: "Stephen J. Turnbull" <stephen@xemacs.org>
To: "Jordi Gutiérrez Hermoso" <jordigh@octave.org>
Cc: "Rüdiger Sonderfeld" <ruediger@c-plusplus.de>,
"Neal Becker" <ndbecker2@gmail.com>,
"François Orieux" <orieux@iap.fr>,
emacs-devel@gnu.org
Subject: Re: preferring mercurial
Date: Sat, 11 Jan 2014 04:20:40 +0900 [thread overview]
Message-ID: <8738kvfxtj.fsf@uwakimon.sk.tsukuba.ac.jp> (raw)
In-Reply-To: <1389366228.5784.14.camel@Iris>
Jordi Gutiérrez Hermoso writes:
> Furthermore, hg's internal data structures aren't that hard to
> understand either. Commit -> tree -> blob -> ref, meet changelog ->
> manifest -> filelog -> revlog.
Besides the fact that blob->ref is nonsense, look whose terminology
makes more sense here.
> > Nothing has more respect for history than git.
>
> This isn't very respectful of history:
>
> http://www.infoq.com/news/2013/11/use-the-force/
First, note that the culprit, Gerrit, does not use git to access git
repos, and by *default* does push --force. Blaming this particular
disaster on git itself is unfair.
Second, from hg help push:
-f --force force push
Note:
Extra care should be taken with the -f/--force option, which
will push all new heads on all branches, an action which will
almost always cause confusion for collaborators.
IOW, this is a people problem, which Mercurial would be subject to as
well.
> > History isn't *changed*, it is recreated
>
> Same in hg. New history means new hashes. Old history is still
> lying around.
Where? How do you get at it? Eg (some output deleted):
$ mkdir hgtest && cd hgtest && hg init
$ echo foo >> foo && hg add foo && hg commit -m 1 && hg heads
changeset: 0:ead82a170088
$ echo foo >> foo && hg commit -m 2 && hg heads
changeset: 1:e5790bc8b230
$ hg rollback
repository tip rolled back to revision 0 (undo commit)
$ hg heads
changeset: 0:ead82a170088
$ hg log -r ead82a170088
changeset: 0:ead82a170088
$ hg log -r e5790bc8b230
abort: unknown revision 'e5790bc8b230'!
Oops. The same thing happened with "commit --amend".
> > AFAIK hg and bzr *do* destroy history when they perform operations
> > like commit --amend, strip, and rebase.
>
> I hope I helped you to know better now.
Unfortunately, no. The actual behavior of hg is indeed immediately
destructive in some cases, unlike git.
next prev parent reply other threads:[~2014-01-10 19:20 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-09 12:35 preferring mercurial Neal Becker
2014-01-09 13:11 ` Tim Visher
2014-01-09 13:53 ` Neal Becker
2014-01-09 13:44 ` Rüdiger Sonderfeld
2014-01-09 14:49 ` François Orieux
2014-01-09 17:31 ` Stephen J. Turnbull
2014-01-10 9:54 ` François Orieux
2014-01-10 11:48 ` Nathan Trapuzzano
2014-01-10 12:44 ` Stephen J. Turnbull
2014-01-10 11:50 ` Stephen J. Turnbull
2014-01-10 13:59 ` Stefan Monnier
2014-01-10 14:08 ` Eric S. Raymond
2014-01-10 15:22 ` Jordi Gutiérrez Hermoso
2014-01-10 15:55 ` Eric S. Raymond
2014-01-10 16:09 ` Jordi Gutiérrez Hermoso
2014-01-10 16:21 ` Eli Zaretskii
2014-01-11 7:15 ` Richard Stallman
2014-01-10 15:03 ` Jordi Gutiérrez Hermoso
2014-01-10 19:20 ` Stephen J. Turnbull [this message]
2014-01-10 19:54 ` David Engster
2014-01-10 19:55 ` Jordi Gutiérrez Hermoso
2014-01-11 15:55 ` Stephen J. Turnbull
2014-01-11 16:37 ` David Kastrup
2014-01-15 17:07 ` Martin Geisler
2014-01-15 16:49 ` Martin Geisler
2014-01-09 15:42 ` Yuri Khan
2014-01-10 15:16 ` Jordi Gutiérrez Hermoso
2014-01-09 20:28 ` Barry Warsaw
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8738kvfxtj.fsf@uwakimon.sk.tsukuba.ac.jp \
--to=stephen@xemacs.org \
--cc=emacs-devel@gnu.org \
--cc=jordigh@octave.org \
--cc=ndbecker2@gmail.com \
--cc=orieux@iap.fr \
--cc=ruediger@c-plusplus.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.