From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] Additional merge-base tests
Date: Tue, 04 Jul 2006 13:16:22 +0200 [thread overview]
Message-ID: <e8dim7$8cm$1@sea.gmane.org> (raw)
In-Reply-To: 7vsllhhcxr.fsf@assigned-by-dhcp.cox.net
Junio C Hamano wrote:
> The problem ALASCM's example demonstrates does rely on clock
> skews. The timestamps used in the example looked like this:
>
>
> 1 1
> / \/ \
> 4 -1 4
> | | |
> 3 -2 3
> | | |
> 2 -3 2
> \ | /
> 0
>
> The crucial clock skew the case relies on is that the tip of the
> middle branch (-1) is older than the common commit (0). But the
> topmost commits with timestamp 1 could be with timestamp 5 to
> correct the clock skew and still make the example "fail".
>
> 5 5
> / \/ \
> 4 -1 4
> | | |
> 3 -2 3
> | | |
> 2 -3 2
> \ | /
> 0
So would putting timestamp for merge be MAX(now, parents timestamps)
solve the problem?
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2006-07-04 11:16 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-04 3:55 [PATCH] Additional merge-base tests A Large Angry SCM
2006-07-04 5:47 ` Junio C Hamano
2006-07-04 6:41 ` A Large Angry SCM
2006-07-04 7:17 ` Junio C Hamano
2006-07-04 7:45 ` Junio C Hamano
2006-07-04 8:23 ` Johannes Schindelin
2006-07-04 10:38 ` Junio C Hamano
2006-07-04 11:16 ` Jakub Narebski [this message]
2006-07-04 11:35 ` Johannes Schindelin
2006-07-04 11:40 ` Johannes Schindelin
2006-07-04 20:18 ` A Large Angry SCM
2006-07-04 21:15 ` Junio C Hamano
2006-07-04 22:25 ` Johannes Schindelin
2006-07-04 22:42 ` Junio C Hamano
2006-07-04 23:07 ` A Large Angry SCM
2006-07-04 23:14 ` Jakub Narebski
2006-07-04 23:39 ` Junio C Hamano
2006-07-05 0:26 ` A Large Angry SCM
2006-07-05 0:24 ` Junio C Hamano
2006-07-05 7:56 ` Johannes Schindelin
2006-07-05 16:15 ` A Large Angry SCM
2006-07-05 17:04 ` Johannes Schindelin
2006-07-05 8:39 ` Josef Weidendorfer
2006-07-05 14:28 ` A Large Angry SCM
2006-07-04 20:08 ` A Large Angry SCM
2006-07-05 0:59 ` Junio C Hamano
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='e8dim7$8cm$1@sea.gmane.org' \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).