Re: [HACKERS] cvs to git migration - keywords

2010-07-15 Thread Aidan Van Dyk
* Aidan Van Dyk [100715 13:56]: > * Marko Kreen [100715 13:49]: > > > Eh. I stand corrected - what it actually does is even more > > bizarre - it stores whatever is on the disk, but then > > expands on re-write. So: > > > > - r1.1 contains $Id$ in the repo. > > - r1.2 contains $Id: 1.1$ in t

Re: [HACKERS] cvs to git migration - keywords

2010-07-15 Thread Aidan Van Dyk
* Marko Kreen [100715 13:49]: > Eh. I stand corrected - what it actually does is even more > bizarre - it stores whatever is on the disk, but then > expands on re-write. So: > > - r1.1 contains $Id$ in the repo. > - r1.2 contains $Id: 1.1$ in the repo. > > and so on... It's actually slightl

Re: [HACKERS] cvs to git migration - keywords

2010-07-15 Thread Marko Kreen
On 7/15/10, Andrew Dunstan wrote: > Marko Kreen wrote: > > On 7/7/10, Tom Lane wrote: > > > Robert Haas writes: > > > > So what happens right now using the existing git repository is that > > > > the $PostgeSQL$ tags are there, but they're unexpanded. They just > say > > > > $PostgreSQL$ ra

Re: [HACKERS] cvs to git migration - keywords

2010-07-15 Thread Andrew Dunstan
Marko Kreen wrote: On 7/7/10, Tom Lane wrote: Robert Haas writes: > So what happens right now using the existing git repository is that > the $PostgeSQL$ tags are there, but they're unexpanded. They just say > $PostgreSQL$ rather than $PostgreSQL: tgl blah blah$. Really? All of the

Re: [HACKERS] cvs to git migration - keywords

2010-07-15 Thread Marko Kreen
On 7/7/10, Tom Lane wrote: > Robert Haas writes: > > So what happens right now using the existing git repository is that > > the $PostgeSQL$ tags are there, but they're unexpanded. They just say > > $PostgreSQL$ rather than $PostgreSQL: tgl blah blah$. > > > Really? All of them? Seems like

Re: [HACKERS] cvs to git migration - keywords

2010-07-15 Thread Markus Wanner
Hi, On 07/07/2010 08:31 PM, Andrew Dunstan wrote: Personally I favor leaving the expanded keywords in what we import, so that there's an exact mapping between what's in the final CVS repo and what's in the inital git repo, and then removing them entirely. I don't see that having old keyword expa

Re: [HACKERS] cvs to git migration - keywords

2010-07-07 Thread Magnus Hagander
On Wed, Jul 7, 2010 at 16:40, Tom Lane wrote: > Dave Page writes: >> On Wed, Jul 7, 2010 at 10:01 AM, Magnus Hagander wrote: >>> 1) We can migrate the repository with the keywords, and then make one big >>> commit just after (or before, that doesn't make a difference) removing >>> them. In this

Re: [HACKERS] cvs to git migration - keywords

2010-07-07 Thread Magnus Hagander
On Wed, Jul 7, 2010 at 20:31, Andrew Dunstan wrote: > > > Robert Haas wrote: >> >> So what happens right now using the existing git repository is that >> the $PostgeSQL$ tags are there, but they're unexpanded.  They just say >> $PostgreSQL$ rather than $PostgreSQL: tgl blah blah$.  I'm all in >> f

Re: [HACKERS] cvs to git migration - keywords

2010-07-07 Thread Andrew Dunstan
Robert Haas wrote: So what happens right now using the existing git repository is that the $PostgeSQL$ tags are there, but they're unexpanded. They just say $PostgreSQL$ rather than $PostgreSQL: tgl blah blah$. I'm all in favor of removing them, but it would be nice if we could avoid clutteri

Re: [HACKERS] cvs to git migration - keywords

2010-07-07 Thread Robert Haas
On Wed, Jul 7, 2010 at 10:57 AM, Tom Lane wrote: > Robert Haas writes: >> So what happens right now using the existing git repository is that >> the $PostgeSQL$ tags are there, but they're unexpanded.  They just say >> $PostgreSQL$ rather than $PostgreSQL: tgl blah blah$. > > Really?  All of them

Re: [HACKERS] cvs to git migration - keywords

2010-07-07 Thread Tim Landscheidt
Tom Lane wrote: >>> 1) We can migrate the repository with the keywords, and then make one big >>> commit just after (or before, that doesn't make a difference) removing >>> them. In this case, backbranches and tags look exactly like they do >>> now, but it also means if you do "git diff" between

Re: [HACKERS] cvs to git migration - keywords

2010-07-07 Thread Tom Lane
Robert Haas writes: > So what happens right now using the existing git repository is that > the $PostgeSQL$ tags are there, but they're unexpanded. They just say > $PostgreSQL$ rather than $PostgreSQL: tgl blah blah$. Really? All of them? Seems like that would have taken some intentional proce

Re: [HACKERS] cvs to git migration - keywords

2010-07-07 Thread Aidan Van Dyk
* Dave Page [100707 05:05]: > > +1 for #1. Changing history and the resulting possibility of becoming > one's own grandfather always makes me nervous. But, since we're already using CVS, our grandfather is already our granddaughter... I'll just point out that if you "expand" the CVS keywords in

Re: [HACKERS] cvs to git migration - keywords

2010-07-07 Thread Robert Haas
On Wed, Jul 7, 2010 at 5:01 AM, Magnus Hagander wrote: > In the previous discussions of how to migrate from cvs to git, we've > all agreed we should kill the keyword expansion that we have now. I > don't think, however, that we ever decided what to do with the *old* > keywords. We did say we want

Re: [HACKERS] cvs to git migration - keywords

2010-07-07 Thread Dave Page
On Wed, Jul 7, 2010 at 3:40 PM, Tom Lane wrote: > One point that isn't completely clear from Magnus' description is > whether we should remove the $PostgreSQL$ lines from the HEAD branch > only, or from the still-active back branches as well.  I vote for the > latter --- that is, if you pull a his

Re: [HACKERS] cvs to git migration - keywords

2010-07-07 Thread Tom Lane
Dave Page writes: > On Wed, Jul 7, 2010 at 10:01 AM, Magnus Hagander wrote: >> 1) We can migrate the repository with the keywords, and then make one big >> commit just after (or before, that doesn't make a difference) removing >> them. In this case, backbranches and tags look exactly like they do

Re: [HACKERS] cvs to git migration - keywords

2010-07-07 Thread Andrew Dunstan
Magnus Hagander wrote: In the previous discussions of how to migrate from cvs to git, we've all agreed we should kill the keyword expansion that we have now. I don't think, however, that we ever decided what to do with the *old* keywords. We did say we want to be able to reproduce backbranches/

Re: [HACKERS] cvs to git migration - keywords

2010-07-07 Thread Dave Page
On Wed, Jul 7, 2010 at 10:01 AM, Magnus Hagander wrote: > 1) We can migrate the repository with the keywords, and then make one big > commit just after (or before, that doesn't make a difference) removing > them. In this case, backbranches and tags look exactly like they do > now, but it also mean

[HACKERS] cvs to git migration - keywords

2010-07-07 Thread Magnus Hagander
In the previous discussions of how to migrate from cvs to git, we've all agreed we should kill the keyword expansion that we have now. I don't think, however, that we ever decided what to do with the *old* keywords. We did say we want to be able to reproduce backbranches/tags *identically* to what