iakioの日記 RSSフィード

2008-09-20

remote addしてmerge

| 18:21 | remote addしてmerge - iakioの日記 を含むブックマーク はてなブックマーク - remote addしてmerge - iakioの日記

http://git.postgresql.org/ を見てみたら、実はcteに関しては git://git.postgresql.org/git/~davidfetter/cte/.git/

というリポジトリが用意されてました。

なので、これをcloneしつつ、本体の方をgit-remote addする方向で。

git-rebaseあたりも調べておく必要がある気がしてきました。

% git-clone git://git.postgresql.org/git/~davidfetter/cte/.git/ 
#### 小一時間

% cd cte
% git-log
commit c02e8785f76bbad7136e41b0e8f0e9d97cbf616a
Author: David Fetter <davidfetter@qonos.postgresql.org>
Date:   Wed Sep 17 23:58:34 2008 +0000

    Ishii-san's latest patch

commit a278fc38a438a5c7536388a795d45ee6899741ab
...

#### remote追加
% git-remote add PostgreSQL git://git.postgresql.org/git/postgresql.git
% git-remote
PostgreSQL
origin
% git-fetch PostgreSQL
#### これは30秒くらいでおわります
remote: Counting objects: 7687, done.
...
 * [new branch]      master     -> PostgreSQL/master

#### 本体との比較
% git-diff PostgreSQL/master..HEAD

diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index 7003092..40e0460 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -6664,9 +6664,6 @@
        A list of the frequencies of the most common values or elements,
        i.e., number of occurrences of each divided by total number of rows.
        (NULL when <structfield>most_common_vals</structfield> is.)
-       For some datatypes such as <type>tsvector</>, it can also store some
-       additional information, making it longer than the
-       <structfield>most_common_vals</> array.
       </entry>
      </row>
...
#### 本体の方が大分進んでしまっている

#### ピリオド三つだと違う結果になる
% git-diff PostgreSQL/master...HEAD
diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml
index e463d15..add0ccd 100644
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -20,6 +20,7 @@ PostgreSQL documentation

  <refsynopsisdiv>
 <synopsis>
+[WITH [RECURSIVE] <replaceable class="parameter">with_query</replaceable> [, ...] ]
 SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replaceable> [, ...] ) ] ]


#### 本体の進んだ分を取り込む
% git-merge PostgreSQL/master
Merge made by recursive.
 doc/src/sgml/catalogs.sgml          |    3 +
 doc/src/sgml/libpq.sgml             |   80 +++++++--
 src/backend/storage/file/fd.c       |   19 ++-
 src/backend/tsearch/Makefile        |    2 +-
 src/backend/tsearch/ts_selfuncs.c   |  363 +++++++++++++++++++++++++++++++++++
 src/backend/tsearch/ts_typanalyze.c |   82 +++++++--
 src/include/catalog/catversion.h    |    2 +-
 src/include/catalog/pg_operator.h   |    8 +-
 src/include/catalog/pg_proc.h       |    6 +-
 src/include/catalog/pg_statistic.h  |    8 +-
 src/include/commands/trigger.h      |    2 +-
 src/include/tsearch/ts_type.h       |    3 +
 src/interfaces/ecpg/nls.mk          |   11 +
 src/interfaces/libpq/exports.txt    |    1 +
 src/interfaces/libpq/fe-exec.c      |   51 +++--
 src/interfaces/libpq/libpq-events.c |   33 ++++
 src/interfaces/libpq/libpq-events.h |   13 +-
 src/interfaces/libpq/libpq-int.h    |    1 +
 18 files changed, 623 insertions(+), 65 deletions(-)
 create mode 100644 src/backend/tsearch/ts_selfuncs.c

#### git-mergeすると自動的にcommitされるみたいです。
#### --no-commitというオプションもある様子。
% git-log
commit 44fa46c1c171091e9b22309305a43cc6859a9c5a
Merge: c02e878... 4d42c9b...
Author: my name <iakio@xxxxxxxxxxx>
Date:   Sat Sep 20 18:03:05 2008 +0900

    Merge commit 'PostgreSQL/master'

commit 4d42c9bafdf2dbd45f4f3f458746479120dd1311
Author: Tom Lane <tgl@sss.pgh.pa.us>
Date:   Fri Sep 19 20:06:13 2008 +0000

    Add a PQfireResultCreateEvents function to allow applications to mimic the
    sequence of operations that libpq goes through while creating a PGresult.
    Also, remove ill-considered "const" decoration on parameters passed to
    event procedures.

AymanAyman2012/12/26 11:26I'm gareutfl you made the post. It's cleared the air for me.

ohdcsofjdrohdcsofjdr2012/12/27 22:47xjLcqq , [url=http://ynbuaamknfpg.com/]ynbuaamknfpg[/url], [link=http://lohlfnrlajpp.com/]lohlfnrlajpp[/link], http://soaubmcthhff.com/

StaaliniaStaalinia2018/01/26 04:48Aclepsa Buy Propecia Welts Develop While Taking Keflex <a href=http://ciali5mg.com>online pharmacy</a> Kamagra Blog Amoxicillin Sensitivity To Light

DiaspoinyDiaspoiny2018/04/18 04:30Viagra Generika De Viagra France Paypal Order Effexor Online No Prescription <a href=http://brandciali.com>canadian pharmacy cialis</a> Cialis Modalita D'Uso Buy Propecia Online India Pildora Propecia

DiaspoinyDiaspoiny2018/05/02 07:14Canadian Drug Stores Viagra Canadian Pharmacy Online Express Buying Direct Levaquin Medicine By Money Order <a href=http://buyciali.com>cialis vs viagra</a> Generic Bentyl Mastercard Cheapeast Overseas Wigan Medicina Cialis Tadalafil Canadian Online Drug Site Reviews

トラックバック - http://postgresql.g.hatena.ne.jp/iakio/20080920