From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
To: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Cc: "Santi Béjar" <santi@agolina.net>,
"Junio C Hamano" <gitster@pobox.com>,
git@vger.kernel.org, "Thomas Rast" <trast@student.ethz.ch>
Subject: Re: [PATCH] rebase: be cleverer with rebased upstream branches
Date: Sat, 12 Mar 2011 22:14:04 -0500 (EST) [thread overview]
Message-ID: <alpine.DEB.2.00.1103122159300.15442@debian> (raw)
In-Reply-To: <alpine.DEB.2.00.1103122005490.15442@debian>
On Sat, 12 Mar 2011, Martin von Zweigbergk wrote:
> On Sun, 13 Mar 2011, Santi B?jar wrote:
>
> > Could you test also variants of the exponential strategy?
>
> I guess I could :-). Will see if I get time for that later today.
So here are the updated figures for the force-updated history
(pu-like):
u@{10} u@{100} u@{1000}
manual 0m0.535s 0m1.164s 0m1.415s
linear 0m1.245s 0m37.367s 5m10.068s
merge-base 0m14.490s 0m15.409s 0m15.508s
exp(1,2) 0m1.056s 0m6.175s 0m27.221s
exp(10,10) 0m1.950s 0m20.031s 0m18.215s
exp(7,7) 0m1.310s 0m6.851s 0m16.757s
and for the non-force-updated history (master-like):
u@{10} u@{100} u@{1000}
manual 0m0.885s 0m6.126s 0m52.248s
linear 0m1.349s 0m39.688s 5m28.753s
merge-base 0m1.160s 0m1.699s 0m1.901s
exp(1,2) 0m0.769s 0m4.342s 0m7.360s
exp(10,10) 0m0.700s 0m2.535s 0m3.110s
exp(7,7) 0m0.653s 0m2.332s 0m3.506s
exp(10,10) is worst possible for the test cases I picked, since the
wanted reflog entry is always the first one in an interval, so almost
10 times as many entries as necessary are considered. I therefore also
tried with exp(7,7) to get more fair figures.
/Martin
next prev parent reply other threads:[~2011-03-13 3:14 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-14 13:51 [PATCH] rebase: be cleverer with rebased upstream branches Martin von Zweigbergk
2011-02-15 11:28 ` Santi Béjar
2011-02-16 1:37 ` Martin von Zweigbergk
2011-02-16 9:26 ` Santi Béjar
2011-02-15 20:30 ` Junio C Hamano
2011-02-16 3:03 ` Martin von Zweigbergk
2011-02-16 12:10 ` Santi Béjar
2011-02-16 13:22 ` Santi Béjar
2011-02-16 19:07 ` Junio C Hamano
2011-02-16 21:16 ` Santi Béjar
2011-02-16 16:45 ` Martin von Zweigbergk
2011-02-17 10:24 ` Santi Béjar
2011-03-12 21:15 ` Martin von Zweigbergk
2011-03-12 23:51 ` Santi Béjar
2011-03-13 1:32 ` Martin von Zweigbergk
2011-03-13 3:14 ` Martin von Zweigbergk [this message]
2011-03-13 22:57 ` Junio C Hamano
2011-03-13 23:42 ` Santi Béjar
2011-03-13 23:09 ` Santi Béjar
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=alpine.DEB.2.00.1103122159300.15442@debian \
--to=martin.von.zweigbergk@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=santi@agolina.net \
--cc=trast@student.ethz.ch \
/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