* Robert Haas <robertmhaas@gmail.com> [090527 22:43]:
> On Wed, May 27, 2009 at 10:09 PM, Aidan Van Dyk <aidan@highrise.ca> wrote:
> > * Robert Haas <robertmhaas@gmail.com> [090527 21:30]:
> >
> >> > And actually looking at the history of the gpo repo, the branches are all
> >> > messed up with "merges" and stuff that I'm not sure where they are coming
> >> > from... 8.2, 8.3, and master(HEAD) are all the same as my gpo repo, but the
> >> > back branchs are very bad...
> >>
> >> This is really quite horrible. What is the best way forward here?
> >
> > That depends entirely on what the project wants.
>
> I can't speak for anyone else, but what I want is for the git tree on
> git.postgresql.org to match CVS.
Well, sure, but I think the "way forward" part implied recognition that
the current tree at git.postgresql.org *doesn't* match CVS very closely
(for back branches), and that people currently rely on it and use it.
So, again, the answer to the question really does depend on what the
"canonical" VCS of the project is. As of now, it's *still* CVS, and
those using either git repo can still develop and submit patches to CVS
easily.
When the project switches, there will probably need to be a more
canonical conversion, with one of the tools that doesn't support
incremental imports, and then people will have to adjust their current
repo with any of rebase/graft/filter-branch to adjust their work
history onto the "official" tree...
All that based on the assumption that when the project switches to git,
they actually want all the CVS history in their official tree. Its
certainly not necessary, and possibly not even desirable... PostgreSQL
could just as easily to a "linus" style switch when they switch to git,
and just "import" the latest release in each branch as the starting
point for each branch. The git repository will have no history, and
people can choose which history they want to graft in... CVSROOT can be
made available as a historical download.
a.
--
Aidan Van Dyk Create like a god,
aidan@highrise.ca command like a king,
http://www.highrise.ca/ work like a slave.