Re: Hacking on PostgreSQL via GIT - Mailing list pgsql-hackers

From Alvaro Herrera
Subject Re: Hacking on PostgreSQL via GIT
Date
Msg-id 20070418125517.GB3836@alvh.no-ip.org
Whole thread Raw
In response to Re: Hacking on PostgreSQL via GIT  (Tom Lane <tgl@sss.pgh.pa.us>)
List pgsql-hackers
Tom Lane wrote:
> Martin Langhoff <martin@catalyst.net.nz> writes:
> > Aidan Van Dyk wrote:
> >> And remember the warning I gave that my conversion is *not* a direct CVS
> >> import - I intentionally *unexpand* all Keywords before stuffing them
> >> into GIT so that merging and branching can ignore all the Keyword
> >> conflicts... 
> 
> > My import is unexpanding those as well to support rebasing and merging
> > better.
> 
> Um ... why do either of you feel there's an issue there?
> 
> We switched over to $PostgreSQL$ a few years ago specifically to avoid
> creating merge problems for downstream repositories.  If there are any
> other keyword expansions left in the source text I'd vote to remove
> them.  If you have a problem with $PostgreSQL$, why?

One weird thing I noticed some time ago is that we have an $Id$ (or was
it $Header$? I don't remember) somewhere, which was supposed to be from
the upstream repo where we got the file from, but it was being expanded
to our local version to the file.  We _also_ have the $PostgreSQL$ tag
in there which carries the same info.

-- 
Alvaro Herrera                                http://www.CommandPrompt.com/
PostgreSQL Replication, Consulting, Custom Development, 24x7 support


pgsql-hackers by date:

Previous
From: Aidan Van Dyk
Date:
Subject: Re: Hacking on PostgreSQL via GIT
Next
From: Greg Smith
Date:
Subject: Background LRU Writer/free list