Junio C Hamano [Mon, 27 Apr 2009 02:48:39 +0000 (19:48 -0700)]
Meta/V: translate dirty->with changes consistently
Junio C Hamano [Sun, 26 Apr 2009 06:39:24 +0000 (23:39 -0700)]
Meta/V: deal with the initial bootstrapping case a bit better
There could be no git installed initially from the integration branch
being probed.
Junio C Hamano [Sun, 26 Apr 2009 05:05:45 +0000 (22:05 -0700)]
Allow multi-arch installation
Junio C Hamano [Mon, 20 Apr 2009 02:36:12 +0000 (19:36 -0700)]
Add vir-fc9
Junio C Hamano [Mon, 20 Apr 2009 02:35:57 +0000 (19:35 -0700)]
In some places I have git in $HOME/git.git
Junio C Hamano [Sun, 19 Apr 2009 23:10:04 +0000 (16:10 -0700)]
Meta/Dothem: do not create separate worktree for Meta in build farms
Junio C Hamano [Sun, 19 Apr 2009 23:08:03 +0000 (16:08 -0700)]
Meta/Dothem: detect unknown options
Junio C Hamano [Sun, 19 Apr 2009 16:06:33 +0000 (09:06 -0700)]
Meta/Dothem: pass --locale=* to underlying Meta/Make
Junio C Hamano [Sun, 19 Apr 2009 16:01:41 +0000 (09:01 -0700)]
Meta/Make: allow --locale= and --test= to be given
It often is convenient to run only specific tests while still staying
at the toplevel (some failures only reproduce with particular allocation
patterns, for example). You can say
$ Meta/Make --test='1013 91??'
to run only test 1013 and 91xx series.
Similarly, you can give --locale=en_US.UTF-8 or somesuch; earlier we
always run tests in C locale for reproducibility, and the default
stays the same, but sometimes it is useful to run tests in different
locale.
Junio C Hamano [Sun, 19 Apr 2009 12:12:57 +0000 (05:12 -0700)]
Dothem: make it easier to bootstrap
Junio C Hamano [Thu, 16 Apr 2009 05:46:08 +0000 (22:46 -0700)]
What's cooking 2009-04 #3
Junio C Hamano [Thu, 16 Apr 2009 05:27:26 +0000 (22:27 -0700)]
What's cooking
Junio C Hamano [Thu, 9 Apr 2009 09:10:59 +0000 (02:10 -0700)]
What's in
Junio C Hamano [Thu, 9 Apr 2009 09:09:41 +0000 (02:09 -0700)]
What's in
Junio C Hamano [Mon, 6 Apr 2009 08:06:54 +0000 (01:06 -0700)]
What's cooking
Junio C Hamano [Thu, 2 Apr 2009 20:01:23 +0000 (13:01 -0700)]
Dothem: no point not installing doc if we build it
It is the building part that is expensive.
Junio C Hamano [Thu, 2 Apr 2009 19:13:55 +0000 (12:13 -0700)]
Make: set ASCIIDOC_NO_ROFF unconditionally for now
Junio C Hamano [Thu, 2 Apr 2009 17:19:54 +0000 (10:19 -0700)]
Reintegrate: only detect conflict markers in conflicted files
Otherwise we would misidentify new sections in documentation set
marked with ======= as conflict markers.
Junio C Hamano [Thu, 2 Apr 2009 17:18:29 +0000 (10:18 -0700)]
Dothem: fix dotest/nodoc conditional
The test for nodoc was wrong and also missing from jch branch.
When dotest is not set, make was run twice. By running make with
just $dotest, we can build either (implicit) all or test.
Junio C Hamano [Mon, 30 Mar 2009 21:42:33 +0000 (14:42 -0700)]
Dothem: Allow nodoc option
Junio C Hamano [Mon, 30 Mar 2009 21:42:01 +0000 (14:42 -0700)]
What's cooking/in
Junio C Hamano [Mon, 30 Mar 2009 21:41:37 +0000 (14:41 -0700)]
Reintegrate: Accept rerere by default
Junio C Hamano [Sat, 21 Mar 2009 07:32:01 +0000 (00:32 -0700)]
What's cooking
Junio C Hamano [Wed, 18 Mar 2009 05:35:53 +0000 (22:35 -0700)]
What's in
Junio C Hamano [Wed, 18 Mar 2009 05:29:29 +0000 (22:29 -0700)]
Dothem: reset before checking it out again to squelch messages.
Junio C Hamano [Wed, 18 Mar 2009 05:28:38 +0000 (22:28 -0700)]
GRADUATED: compare with older maintenance series as well
Junio C Hamano [Wed, 18 Mar 2009 05:28:07 +0000 (22:28 -0700)]
Announce: typofix
Junio C Hamano [Wed, 18 Mar 2009 05:27:48 +0000 (22:27 -0700)]
What's cooking
Junio C Hamano [Sun, 15 Mar 2009 06:01:31 +0000 (23:01 -0700)]
What's in/cooking
Junio C Hamano [Thu, 12 Mar 2009 23:05:56 +0000 (16:05 -0700)]
Update Dothem to build if jch and next are different
Junio C Hamano [Thu, 12 Mar 2009 23:05:42 +0000 (16:05 -0700)]
Update Dothem to be more quiet
Junio C Hamano [Wed, 11 Mar 2009 09:25:03 +0000 (02:25 -0700)]
What's cooking
Junio C Hamano [Fri, 6 Mar 2009 08:25:38 +0000 (00:25 -0800)]
What's in -- first mass graduation post 1.6.2
Junio C Hamano [Fri, 6 Mar 2009 08:24:33 +0000 (00:24 -0800)]
Dothem update
Junio C Hamano [Thu, 5 Mar 2009 10:00:48 +0000 (02:00 -0800)]
What's in/cooking
Junio C Hamano [Thu, 5 Mar 2009 09:50:23 +0000 (01:50 -0800)]
Add Dothem script
This keeps the checkout around and performs much better than Doit.
Junio C Hamano [Wed, 4 Mar 2009 19:41:05 +0000 (11:41 -0800)]
Post 1.6.2 maintnotes updates
Thank new contributors as well.
Junio C Hamano [Wed, 4 Mar 2009 19:40:32 +0000 (11:40 -0800)]
SE: allow arbitrary send-email options after --
Junio C Hamano [Wed, 4 Mar 2009 19:40:07 +0000 (11:40 -0800)]
Remove bunch of stale issues - the list is unmaintained these days
Junio C Hamano [Wed, 4 Mar 2009 19:39:04 +0000 (11:39 -0800)]
Remove emacsorg-mode list; it seems to be moderated
Junio C Hamano [Tue, 3 Mar 2009 09:08:00 +0000 (01:08 -0800)]
Leftover what's cooking
Junio C Hamano [Tue, 3 Mar 2009 09:06:58 +0000 (01:06 -0800)]
What's in
Junio C Hamano [Tue, 3 Mar 2009 09:01:05 +0000 (01:01 -0800)]
What's in
Junio C Hamano [Tue, 17 Feb 2009 07:55:40 +0000 (23:55 -0800)]
What's cooking
Junio C Hamano [Tue, 17 Feb 2009 07:52:17 +0000 (23:52 -0800)]
Update Announce for release candidates and use ProjectContact
Junio C Hamano [Tue, 17 Feb 2009 07:52:02 +0000 (23:52 -0800)]
Add ProjectContact script
Junio C Hamano [Sun, 15 Feb 2009 10:44:31 +0000 (02:44 -0800)]
What's in
Junio C Hamano [Sun, 15 Feb 2009 10:20:22 +0000 (02:20 -0800)]
What's cooking
Junio C Hamano [Sat, 14 Feb 2009 00:56:28 +0000 (16:56 -0800)]
Reintegrate: sometimes a specific cherry-pick need to be carried forward
This is especially necessary when you reverted a premature merge
to more stable integration branch while you do want to keep the
topic cooking in more experimental integration branch.
Junio C Hamano [Thu, 12 Feb 2009 04:01:31 +0000 (20:01 -0800)]
What's in
Junio C Hamano [Sat, 7 Feb 2009 21:23:07 +0000 (13:23 -0800)]
What's cooking as of 1.6.2-rc0
Junio C Hamano [Thu, 5 Feb 2009 01:33:08 +0000 (17:33 -0800)]
What's cooking
Junio C Hamano [Mon, 2 Feb 2009 08:04:15 +0000 (00:04 -0800)]
What's in update
Junio C Hamano [Mon, 2 Feb 2009 07:39:21 +0000 (23:39 -0800)]
What's cooking update
Junio C Hamano [Thu, 29 Jan 2009 07:52:52 +0000 (23:52 -0800)]
Add Meta/GRADUATED
Junio C Hamano [Thu, 29 Jan 2009 02:01:57 +0000 (18:01 -0800)]
What's in/cooking
Junio C Hamano [Mon, 26 Jan 2009 08:48:46 +0000 (00:48 -0800)]
Add Meta/Reintegrate
In a workflow that uses topic branches heavily, you would need to keep
updating test integration branch(es) all the time. If they are managed
like my 'next' by merging the tips of topics that have grown since the
last integration, it is not so difficult. You only need to review output
from "git branch --no-merged next" to see if there are topics that can and
needs to be merged to 'next'.
But sometimes it is easier to rebuild a test integration branch from
scratch all the time, especially if you do not publish it for others to
build on.
I've been using this script for some time to rebuild jch and pu branches
in my workflow. jch's tip is supposed to always match 'next', but it is
rebuilt from scratch on top of 'master' by merging the same topics that
are in 'next'. You can use the same script in your work.
To use it, you give a commit range base..tip to the script, and you will
see a shell script that uses a series of 'git-merge'. "base" is the more
stable branch that you rebuild your test integration branch on top (in my
case, 'master'), and "tip" is where the tip of the test integration branch
is from the last round (in my case, 'jch' or 'pu').
Then you can run the resulting script, fix conflicted merge and use
'git-commit', and then repeat until all the branches are re-integrated on
top of the base branch.
$ Meta/Reintegrate master..jch >/var/tmp/redo-jch.sh
$ cat /var/tmp/redo-jch.sh
#!/bin/sh
while read branch eh
do
case "$eh" in
"") git merge "$branch" || break ;;
?*) echo >&2 "Eh? $branch $eh"; break ;;
esac
done <<EOF
jc/blame
js/notes
ks/maint-mailinfo-folded~3
tr/previous-branch
EOF
$ git checkout jch
$ git reset --hard master
$ /var/tmp/redo-jch.sh
... if there is conflict, resolve, "git commit" here ...
$ /var/tmp/redo-jch.sh
... repeat until everything is applied.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sun, 25 Jan 2009 04:37:50 +0000 (20:37 -0800)]
What's in/cooking updates
Junio C Hamano [Fri, 23 Jan 2009 18:47:53 +0000 (10:47 -0800)]
Summary: use reflog
Junio C Hamano [Fri, 23 Jan 2009 18:47:39 +0000 (10:47 -0800)]
Doit: add -noinstall
Junio C Hamano [Fri, 23 Jan 2009 18:37:14 +0000 (10:37 -0800)]
V: pay attention to dirty versions
Junio C Hamano [Fri, 23 Jan 2009 18:36:53 +0000 (10:36 -0800)]
Doit: allow private editions
Junio C Hamano [Fri, 23 Jan 2009 18:36:31 +0000 (10:36 -0800)]
Make: threaded-delta-search should be safe by now
Junio C Hamano [Fri, 23 Jan 2009 18:39:44 +0000 (10:39 -0800)]
SE: no suppress-cc; use configuration
Junio C Hamano [Thu, 22 Jan 2009 03:39:02 +0000 (19:39 -0800)]
What's cooking updates
Junio C Hamano [Mon, 19 Jan 2009 09:12:41 +0000 (01:12 -0800)]
What's cooking
Junio C Hamano [Mon, 19 Jan 2009 08:57:44 +0000 (00:57 -0800)]
What's in
Junio C Hamano [Wed, 14 Jan 2009 08:12:04 +0000 (00:12 -0800)]
What's in/cooking updates
Junio C Hamano [Sun, 11 Jan 2009 09:50:15 +0000 (01:50 -0800)]
What's cooking issue #2 of Jan'09
Junio C Hamano [Tue, 6 Jan 2009 05:45:07 +0000 (21:45 -0800)]
What's cooking 2009-01 issue #1
Junio C Hamano [Tue, 6 Jan 2009 05:21:58 +0000 (21:21 -0800)]
Last issue of What's in/cooking for 2008
Junio C Hamano [Thu, 25 Dec 2008 06:39:40 +0000 (22:39 -0800)]
Post 1.6.1 updates
Junio C Hamano [Sun, 21 Dec 2008 12:16:55 +0000 (04:16 -0800)]
What's in/cooking
Junio C Hamano [Sun, 14 Dec 2008 08:20:03 +0000 (00:20 -0800)]
What's in/cooking
Junio C Hamano [Wed, 3 Dec 2008 06:55:44 +0000 (22:55 -0800)]
What's in/cooking updates
Junio C Hamano [Wed, 3 Dec 2008 06:55:26 +0000 (22:55 -0800)]
What's in/cooking updates
Junio C Hamano [Sat, 15 Nov 2008 22:11:49 +0000 (14:11 -0800)]
What's in/cooking
Junio C Hamano [Thu, 13 Nov 2008 02:00:32 +0000 (18:00 -0800)]
What's in/cooking
Junio C Hamano [Sun, 9 Nov 2008 22:56:18 +0000 (14:56 -0800)]
What's cooking #3 of Nov 2008
Junio C Hamano [Sun, 9 Nov 2008 18:58:13 +0000 (10:58 -0800)]
Typofix: what's cooking 2008-11 #02
Junio C Hamano [Thu, 6 Nov 2008 01:04:36 +0000 (17:04 -0800)]
What's cooking 2nd issue of Nov 2008
Junio C Hamano [Thu, 6 Nov 2008 01:04:17 +0000 (17:04 -0800)]
Replace logo in maintnotes html version
Junio C Hamano [Thu, 6 Nov 2008 01:03:43 +0000 (17:03 -0800)]
WIP: slight updates to What's cooking script
Junio C Hamano [Thu, 6 Nov 2008 01:02:48 +0000 (17:02 -0800)]
TODO: purge old items
Junio C Hamano [Thu, 6 Nov 2008 01:02:24 +0000 (17:02 -0800)]
Doit: optionally test with /bin/dash
Junio C Hamano [Sun, 2 Nov 2008 21:30:49 +0000 (13:30 -0800)]
What's in/cooking - the first issue in November 08
Junio C Hamano [Thu, 23 Oct 2008 05:37:35 +0000 (22:37 -0700)]
What's in/cooking
Junio C Hamano [Sat, 18 Oct 2008 18:36:40 +0000 (11:36 -0700)]
What's in/cooking
Junio C Hamano [Tue, 14 Oct 2008 07:21:31 +0000 (00:21 -0700)]
What's in/cooking updates
Shawn O. Pearce [Sun, 12 Oct 2008 21:24:19 +0000 (14:24 -0700)]
What's in and cooking 2008-10 #02
Shawn O. Pearce [Mon, 6 Oct 2008 16:57:41 +0000 (09:57 -0700)]
What's in and cooking 2008-10 #01
Shawn O. Pearce [Mon, 29 Sep 2008 18:45:20 +0000 (11:45 -0700)]
What's cooking 2008-09 #04
Junio C Hamano [Mon, 22 Sep 2008 19:41:48 +0000 (12:41 -0700)]
What's in/cooking
Junio C Hamano [Fri, 19 Sep 2008 20:55:07 +0000 (13:55 -0700)]
What's cooking 2008-09 #03
Junio C Hamano [Fri, 19 Sep 2008 03:12:40 +0000 (20:12 -0700)]
Additionally build JCH private edition
Junio C Hamano [Fri, 19 Sep 2008 03:12:10 +0000 (20:12 -0700)]
What's cooking/in 2008 Sep #2
Junio C Hamano [Thu, 18 Sep 2008 06:27:01 +0000 (23:27 -0700)]
Pass ASCIIDOC8=YesPlease to Meta/Make and dodoc.sh as needed
Junio C Hamano [Sun, 7 Sep 2008 06:16:20 +0000 (23:16 -0700)]
Doit: build-test documentation, too.
Junio C Hamano [Sun, 7 Sep 2008 03:44:31 +0000 (20:44 -0700)]
What's in and What's cooking (Sep '08, #1)
Junio C Hamano [Mon, 1 Sep 2008 06:15:17 +0000 (23:15 -0700)]
What's cooking update