From: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
To: Jakub Narebski <jnareb@gmail•com>
Cc: SLONIK.AZ@gmail•com, Anteru <newsgroups@catchall•shelter13.net>,
git@vger•kernel.org
Subject: Re: Deciding between Git/Mercurial
Date: Tue, 29 Sep 2009 21:55:37 +0200 [thread overview]
Message-ID: <vpqk4zhplty.fsf@bauges.imag.fr> (raw)
In-Reply-To: <200909292058.53045.jnareb@gmail.com> (Jakub Narebski's message of "Tue\, 29 Sep 2009 20\:58\:50 +0200")
Jakub Narebski <jnareb@gmail•com> writes:
> On Tue, 29 Sep 2009, Leo Razoumov wrote:
>> On 2009-09-28, Jakub Narebski <jnareb@gmail•com> wrote:
>> > [..snip..]
>> > Besides with nonlinear history with
>> > revision numbers such as 12678 and 12687 you know that 12678 is older
>> > than 12687 if and only if 12678 and 12687 are on the same line of
>> > development.
>>
>> The statement above is incorrect!! In a Mercurial repo local revision
>> numbers are strictly ordered in commit time. 12678 < 12687 means that
>> 12678 was committed prior to 12687. But these two commits could belong
>> to two completely unrelated lines of development.
>
> This is impossible with distributed development.
Yes, the accurate statement is (I think): "In a Mercurial repo local
revision numbers are strictly ordered according _the time when the_
_commit entered the repository_" (i.e. the time you did a merge, not
the time the other guy did the commit).
Just tested:
$ hg log
changeset: 3:4d6db21df0cd
tag: tip
parent: 1:31f8406ae59c
parent: 2:33bfb84a5113
user: Matthieu Moy <Matthieu.Moy@imag•fr>
date: Tue Sep 29 21:54:25 2009 +0200
summary: merge
changeset: 2:33bfb84a5113
parent: 0:a508b050e5ae
user: Matthieu Moy <Matthieu.Moy@imag•fr>
date: Tue Sep 29 21:54:02 2009 +0200
summary: in branch bar
changeset: 1:31f8406ae59c
user: Matthieu Moy <Matthieu.Moy@imag•fr>
date: Tue Sep 29 21:54:11 2009 +0200
summary: in branch foo
changeset: 0:a508b050e5ae
user: Matthieu Moy <Matthieu.Moy@imag•fr>
date: Tue Sep 29 21:53:33 2009 +0200
summary: init
Either I have a time machine at home, or changesets 1 was not made
before changeset 2.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2009-09-29 19:58 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-27 12:24 Deciding between Git/Mercurial Anteru
2009-09-27 18:01 ` Robin Rosenberg
2009-09-27 18:10 ` Anteru
2009-09-27 18:44 ` Alex Riesen
2009-09-27 18:51 ` Mark Struberg
2009-09-27 19:18 ` Anteru
2009-09-27 19:31 ` Alex Riesen
2009-09-27 19:34 ` Erik Faye-Lund
2009-09-27 18:55 ` Pascal Obry
2009-10-22 8:01 ` Martin Langhoff
2009-09-28 8:36 ` Felipe Contreras
2009-09-28 8:42 ` Matthieu Moy
2009-09-28 10:08 ` Johannes Schindelin
2009-09-28 11:01 ` Felipe Contreras
2009-09-28 11:17 ` Bruce Stephens
2009-09-30 11:14 ` Matthias Andree
2009-09-28 11:32 ` Dilip M
2009-09-28 20:54 ` Damien Wyart
2009-09-28 21:09 ` Steven Noonan
2009-09-28 21:33 ` Sverre Rabbelier
2009-09-28 23:56 ` Randal L. Schwartz
2009-09-29 0:01 ` Sverre Rabbelier
2009-09-29 7:44 ` Mike Ralphson
2009-09-29 8:21 ` Matthieu Moy
2009-09-29 8:22 ` Sverre Rabbelier
2009-09-28 23:11 ` Jakub Narebski
2009-09-29 0:32 ` Jakub Narebski
2009-09-29 6:32 ` Anteru
2009-09-29 18:44 ` Leo Razoumov
2009-09-29 18:58 ` Jakub Narebski
2009-09-29 19:55 ` Matthieu Moy [this message]
2009-09-30 0:49 ` Leo Razoumov
2009-09-30 6:28 ` Björn Steinbrink
2009-09-30 9:17 ` Andreas Ericsson
2009-09-30 11:09 ` Jakub Narebski
2009-09-29 1:55 ` Paolo Bonzini
2009-09-29 8:44 ` Daniele Segato
2009-09-29 8:54 ` Dilip M
2009-09-30 11:09 ` Matthias Andree
2009-09-30 22:05 ` Daniel Barkalow
2009-10-22 2:38 ` Dilip M
2009-10-22 6:50 ` Anteru
2009-10-22 7:12 ` Dilip M
2009-10-22 7:35 ` Anteru
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=vpqk4zhplty.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp$(echo .)fr \
--cc=SLONIK.AZ@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jnareb@gmail$(echo .)com \
--cc=newsgroups@catchall$(echo .)shelter13.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox