From: Clemens Buchacher <drizzd@aon.at>
To: Jeff King <peff@peff.net>
Cc: "Junio C Hamano" <gitster@pobox.com>,
git@vger.kernel.org, "Jakub Narebski" <jnareb@gmail.com>,
"Ted Ts'o" <tytso@mit.edu>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH 2/5] add object-cache infrastructure
Date: Tue, 12 Jul 2011 23:15:37 +0200 [thread overview]
Message-ID: <20110712211537.GA3220@toss.lan> (raw)
In-Reply-To: <20110712210716.GB17322@toss.lan>
On Tue, Jul 12, 2011 at 11:07:16PM +0200, Clemens Buchacher wrote:
>
> Exactly. The case I am talking about is where the patch-id's are
> different but there are no conflicts. I have worked out an example
> for git and darcs. Below are two scripts to demonstrate.
Oops, that was the same script twice. Here are the darcs and git
versions, respectively:
#!/bin/sh
#
# Darcs recognizes matching upstream changes
#
testdir=test-darcs
mkdir "$testdir" || exit 1
(
cd "$testdir"
mkdir master
cd master
darcs init
for line in $(seq 20)
do
echo $line >>file
done
darcs add file
darcs record -a -m initial
cd ..
darcs get master side
cd side
sed -i '5 s/^.*$/original change/' file
darcs record -a -m 'original change'
cd ../master
sed -i '5 s/.*/original change/' file
sed -i '15 s/^.*$/with an extra hunk/' file
darcs record -a -m 'original change'
sed -i '5 s/.*/modified change/' file
darcs record -a -m 'modified change'
darcs pull -a ../side
)
#!/bin/sh
#
# Git does not recognize matching upstream changes
#
testdir=test-git
mkdir "$testdir" || exit 1
(
cd "$testdir"
git init -q
for line in $(seq 20)
do
echo $line >>file
done
git add file
git commit -q -m initial
git checkout -q -b side
sed -i '5 s/^.*$/original change/' file
git add file
git commit -q -m 'original change'
git checkout -q master
sed -i '5 s/.*/original change/' file
sed -i '15 s/^.*$/with an extra hunk/' file
git add file
git commit -q -m 'original change'
sed -i '5 s/.*/modified change/' file
git add file
git commit -q -m 'modified change'
git rebase master side
git diff
)
next prev parent reply other threads:[~2011-07-12 21:15 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-11 16:13 [RFC/PATCH 0/5] generation numbers for faster traversals Jeff King
2011-07-11 16:16 ` [PATCH 1/5] decorate: allow storing values instead of pointers Jeff King
2011-07-11 16:39 ` Jeff King
2011-07-11 19:06 ` Junio C Hamano
2011-07-11 21:20 ` Jeff King
2011-07-11 16:17 ` [PATCH 2/5] add object-cache infrastructure Jeff King
2011-07-11 16:46 ` Jeff King
2011-07-11 16:58 ` Shawn Pearce
2011-07-11 19:17 ` Junio C Hamano
2011-07-11 22:01 ` Jeff King
2011-07-11 23:21 ` Junio C Hamano
2011-07-11 23:42 ` Junio C Hamano
2011-07-12 0:03 ` Jeff King
2011-07-12 19:38 ` Clemens Buchacher
2011-07-12 19:45 ` Jeff King
2011-07-12 21:07 ` Clemens Buchacher
2011-07-12 21:15 ` Clemens Buchacher [this message]
2011-07-12 21:36 ` Jeff King
2011-07-14 8:04 ` Clemens Buchacher
2011-07-14 16:26 ` Illia Bobyr
2011-07-13 1:33 ` John Szakmeister
2011-07-12 0:14 ` Illia Bobyr
2011-07-12 5:35 ` Jeff King
2011-07-12 21:52 ` Illia Bobyr
2011-07-12 6:36 ` Miles Bader
2011-07-12 10:41 ` Jakub Narebski
2011-07-12 17:57 ` Jeff King
2011-07-12 18:41 ` Junio C Hamano
2011-07-13 6:37 ` Jeff King
2011-07-13 17:49 ` Junio C Hamano
2011-07-11 16:18 ` [PATCH 3/5] commit: add commit_generation function Jeff King
2011-07-11 17:57 ` Clemens Buchacher
2011-07-11 21:10 ` Jeff King
2011-07-11 16:18 ` [PATCH 4/5] pretty: support %G to show the generation number of a commit Jeff King
2011-07-11 16:18 ` [PATCH 5/5] limit "contains" traversals based on commit generation Jeff King
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=20110712211537.GA3220@toss.lan \
--to=drizzd@aon.at \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=tytso@mit.edu \
/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.
Code repositories for project(s) associated with this public 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).