From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org, Shawn Pearce <spearce@spearce.org>,
Martin Langhoff <martin.langhoff@gmail.com>
Subject: Re: Does GIT has vc keywords like CVS/Subversion?
Date: Tue, 10 Oct 2006 10:41:13 -0700 [thread overview]
Message-ID: <7vy7ro2hmu.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.64.0610101005420.3952@g5.osdl.org> (Linus Torvalds's message of "Tue, 10 Oct 2006 10:14:54 -0700 (PDT)")
Linus Torvalds <torvalds@osdl.org> writes:
> Well, it probably wouldn't be too nasty to try to have a "find nearest
> commit" kind of thing. It's not quite as simple as bisection, but you
> could probably use a bisection-like algorithm to do something like a
> binary search to try to guess which tree is the closest.
I had to do something like that in my day job once. A customer
installation was made from a tarball of unknown vintage, and
then field patched with later fixes.
I ended up slurping the thing back and populated my index with
it. Luckily I could guess a good initial point to find the
commit that gives minimum "git diff" output. Then from the
remaining patches it was reasonably easy to find out which
changes were cherry-picked by hand with "git log master --
$paths".
prev parent reply other threads:[~2006-10-10 17:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-09 1:25 Does GIT has vc keywords like CVS/Subversion? Dongsheng Song
2006-10-09 2:44 ` Liu Yubao
2006-10-09 2:59 ` Petr Baudis
2006-10-09 16:13 ` Linus Torvalds
2006-10-09 21:08 ` Martin Langhoff
2006-10-09 22:48 ` Johannes Schindelin
2006-10-09 22:57 ` Martin Langhoff
2006-10-09 22:55 ` Junio C Hamano
2006-10-10 7:37 ` Rene Scharfe
2006-10-10 16:49 ` Shawn Pearce
2006-10-10 17:14 ` Linus Torvalds
2006-10-10 17:41 ` Junio C Hamano [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vy7ro2hmu.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=martin.langhoff@gmail.com \
--cc=spearce@spearce.org \
--cc=torvalds@osdl.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).