Re: Deciding between Git/Mercurial
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Sep 30, 2009, 11:09 UTC
- Message-ID
- <200909301309.51283.jnareb@gmail.com>
- In-Reply-To
- <ee2a733e0909291749s71801b29ufa827cab715d0abb@mail.gmail.com>
On Wed, 30 Sep 2009, Leo Razoumov wrote:
> On 2009-09-29, Jakub Narebski <jnareb@gmail.com> wrote: >> On Tue, 29 Sep 2009, Leo Razoumov wrote: >>> On 2009-09-28, Jakub Narebski <jnareb@gmail.com> wrote:
Show 33 quoted lines
>>>> [..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. If the second branch >> comes from other repository, with commits _created_ (in that repository) >> earlier than commits in current repository, but commits in first >> branch (from current repository) were created earlier than _fetching_ >> those commits in second branch: >> >> .---.---.---.---x---1---2---3---M---. >> \ / >> \-A---B---C-/ <-- from repository B >> >> >> Either you would have to change commits numbers, and therefore they would >> be not stable, or you would have to change commit time to mean 'time this >> commit got into current repository', which would kill performance for sure. > > Jakub, > in Mercurial sequential commit numbers are local to a repo and are not > unique between the clones. Unique ID is SHA1 as in git. So mercurial > commit 127:aaf123453dfgdfgddd... > means commit number 127 in this repo with SHA1 "aaf123453dfgdfgddd..." > In another clone commit 127 might mean completely different thing. > Sequential commit numbers are strictly for "local convenience".
Yes, I know that in Mercurial commit numbers are local to repository, and even written about it (that sequential commit numbers are possible only either as local identifiers, or in centralized workflow).
The issue I was writing about that sequential commit numbers cannot tell us if commit was earlier or later than some other commit based solely on those commit numbers. As other people in this thread wrote Mercurial numbers commits not in order of commit creation, but in order of commit arriving (being present) in given repository. So commit numbers are not 'strictly ordered in commit time', but ordered in 'time commit got into current (local) repository'.
I'd like also to note that this means that at some time Mercurial has to number all those commit it got on fetch / pull from remote repository. This can be a lot of work... work which Git doesn't have to do (OTOH Git creates index for packfile on local side after fetch...).
-- Jakub Narebski Poland