git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Johannes Sixt <j.sixt@eudaptics.com>
To: Erez Zadok <ezk@cs.sunysb.edu>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: very slow cherry-pick'ing (old-2.6-bkcvs tree)
Date: Fri, 07 Sep 2007 09:27:21 +0200	[thread overview]
Message-ID: <46E0FD59.2060406@eudaptics.com> (raw)
In-Reply-To: <200709062351.l86NpnAK004807@agora.fsl.cs.sunysb.edu>

Erez Zadok schrieb:
> Our group maintains Unionfs on the latest -rc kernel, but we also maintain
> several backports going all the way to 2.6.9.  Once we complete the
> development and testing of a feature/fix in -latest, we cherry-pick those
> commits to older backports, and test those.  When I cherry-pick from -latest
> to my 2.6.{22,21,20,19,18} repositories, it works reasonably fast.  But when
> I cherry-pick to my 2.6.9 tree, it runs about 20 times slower!  Why?  Is
> there anything I can do to inspect what's going on and perhaps speed up the
> cherry-picking process?
> 
> Some info:
> 
> My 2.6.{18,19,20,21,22} trees were cloned from
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.<N>.y.git
> 
> My 2.6.9 tree, however, was cloned from
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/old-2.6-bkcvs.git
> 
> after which, I truncated the tree (git-reset) to Linus commit which read
> "Linux 2.6.9-final".

I *think* that the reason for this is that those repositories don't have any 
commits in common (but I don't have clones to verify my claim). Since 
cherry-pick does merge-recursive, it tries to find a suitable merge base, 
but since there is no history in common, it walks both histories all the way 
down only to find that there is no possible merge base.

You could improve the situation if you graft the histories together:

   echo $first_commit_in_2.6.12 $suitable_commit_in_bkcvs > .git/info/grafts

-- Hannes

      parent reply	other threads:[~2007-09-07  7:27 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-09-06 23:51 Erez Zadok
2007-09-07  4:42 ` Shawn O. Pearce
2007-09-07  7:27 ` Johannes Sixt [this message]

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=46E0FD59.2060406@eudaptics.com \
    --to=j.sixt@eudaptics.com \
    --cc=ezk@cs.sunysb.edu \
    --cc=git@vger.kernel.org \
    --subject='Re: very slow cherry-pick'\''ing (old-2.6-bkcvs tree)' \
    /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

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).