From: Jakub Narebski <jnareb@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Nov 2010, #01; Tue, 9)
Date: Fri, 12 Nov 2010 00:53:27 +0100 [thread overview]
Message-ID: <201011120053.29279.jnareb@gmail.com> (raw)
In-Reply-To: <7vsjz7hj3s.fsf@alter.siamese.dyndns.org>
On Thu, 11 Nov 2010, Junio C Hamano wrote:
> Jakub Narebski <jnareb@gmail.com> writes:
>> Junio C Hamano <gitster@pobox.com> writes:
>> ...
>>> * jh/gitweb-caching (2010-11-01) 4 commits
>>> - gitweb: Minimal testing of gitweb caching
>>> - gitweb: File based caching layer (from git.kernel.org)
>>> - gitweb: add output buffering and associated functions
>>> - gitweb: Prepare for splitting gitweb
>>> (this branch uses jn/gitweb-test.)
>>
>>> * jn/gitweb-test (2010-09-26) 4 commits
>>> (merged to 'next' on 2010-11-05 at 90b3adf)
>>> + gitweb/Makefile: Include gitweb/config.mak
>>> + gitweb/Makefile: Add 'test' and 'test-installed' targets
>>> + t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED
>>> + gitweb: Move call to evaluate_git_version after evaluate_gitweb_config
>>> (this branch is used by jh/gitweb-caching.)
>>
>> These two branches have simple to resolve but non-trivial conflict.
>> Should I rebase 'jh/gitweb-caching' on top of 'jn/gitweb-test' then,
>> resolving this conflict?
>
> In general, when a conflict between topic A and B is simple to resolve
> (and I have the correct resolution already in 'pu'), I'd rather prefer to
> keep topic A independent of topic B than rebasing topic A on top of topic
> B, unless topic A is far from ready and topic B is truly ready and about
> to graduate, so that we can leave a door open for A to graduate before B
> does (or vice versa).
>
> In this case, I think it is overdue (iow, sorry I've been slow) for the
> gitweb-test topic to graduate, so the separation does not really matter.
I have send version of 'gitweb: Prepare for splitting gitweb' that applies
cleanly on top of "gitweb/Makefile: Add 'test' and 'test-installed' targets"
as
"[PATCHv7.1b 1/4] gitweb: Prepare for splitting gitweb"
http://article.gmane.org/gmane.comp.version-control.git/160492
But you probably don't have this in 'pu'.
Resolving of conflict is straighforward, but non-trivial, and consist
of two parts:
* textual conflict caused by adding extra stuff in place where
context is - simple to resolve
* adding support for testing installed version of modules, in the
future if/when we add tests of individual modules (I use this in
my rewrite of gitweb caching) - non-trivial
>> BTW. this would allow me to improve 'gitweb: Minimal testing of gitweb
>> caching'.
>
> Then I probably should leave gitweb-caching out of 'next' when gitweb-test
> graduates to master so that you can refresh the caching series. Thanks
> for a heads-up.
In short: code responsible for turning caching on was duplicated in t9500
and t9502 (will be moved to t/gitweb-lib.sh), and code path with die_error
(e.g. 404 not found case) was not tested.
I'll try to send re-roll (rebased and improved) tomorrow (on Friday).
--
Jakub Narebski
Poland
next prev parent reply other threads:[~2010-11-11 23:53 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-09 19:53 What's cooking in git.git (Nov 2010, #01; Tue, 9) Junio C Hamano
2010-11-09 20:11 ` Ævar Arnfjörð Bjarmason
2010-11-09 20:19 ` Matthieu Moy
2010-11-09 20:29 ` Drew Northup
2010-11-09 20:38 ` Jonathan Nieder
2010-11-09 21:38 ` Jakub Narebski
2010-11-11 17:21 ` Junio C Hamano
2010-11-11 23:53 ` Jakub Narebski [this message]
2010-11-09 21:46 ` Johan Herland
2010-11-09 22:11 ` Jeff King
2010-11-09 22:17 ` Erik Faye-Lund
2010-11-09 22:21 ` Ævar Arnfjörð Bjarmason
2010-11-09 22:25 ` Erik Faye-Lund
2010-11-09 22:27 ` Ævar Arnfjörð Bjarmason
2010-11-10 20:35 ` Yann Dirson
2010-11-11 12:26 ` Nguyen Thai Ngoc Duy
2010-11-11 14:28 ` Nguyen Thai Ngoc Duy
2010-11-14 13:02 ` [PATCH] use persistent memory for rejected paths Clemens Buchacher
2010-11-15 18:31 ` Junio C Hamano
2010-11-15 19:02 ` Clemens Buchacher
2010-11-15 19:03 ` Matthieu Moy
2010-11-15 19:41 ` Clemens Buchacher
2010-11-15 19:52 ` [PATCH v2] " Clemens Buchacher
2010-11-16 16:41 ` Matthieu Moy
2010-11-15 23:05 ` [PATCH] " Junio C Hamano
2010-11-15 23:30 ` Clemens Buchacher
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=201011120053.29279.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).