Skip site navigation (1) Skip section navigation (2)

Re: git: uh-oh

From: Magnus Hagander <magnus(at)hagander(dot)net>
To: Max Bowsher <maxb(at)f2s(dot)com>
Cc: Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us>, Robert Haas <robertmhaas(at)gmail(dot)com>, Michael Haggerty <mhagger(at)alum(dot)mit(dot)edu>, pgsql-hackers <pgsql-hackers(at)postgresql(dot)org>
Subject: Re: git: uh-oh
Date: 2010-08-20 17:43:57
Message-ID: (view raw, whole thread or download thread mbox)
Lists: pgsql-hackers
On Fri, Aug 20, 2010 at 19:41, Max Bowsher <maxb(at)f2s(dot)com> wrote:
> On 20/08/10 18:30, Magnus Hagander wrote:
>> On Fri, Aug 20, 2010 at 19:28, Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> wrote:
>>> Max Bowsher <maxb(at)f2s(dot)com> writes:
>>>> The history that cvs2svn is aiming to represent here is this:
>>>> 1) At the time of creation of the REL8_4_STABLE branch,
>>>> did *not* exist.
>>>> 2) Later, it was added to trunk.
>>>> 3) Then, someone retroactively added the branch tag to the file, marking
>>>> it as included in the REL8_4_STABLE branch. [This corresponds to the git
>>>> changeset that Robert is questioning]
>>> Uh, no.  We have never "retroactively added" anything to any branch.
>>> I don't know enough about the innards of CVS to know what its internal
>>> representation of this sort of thing is, but all that actually happened
>>> here was a "cvs add" and a "cvs commit" in REL8_4_STABLE long after the
>>> branch occurred.  We would like the git history to look like that too.
>> Yeah.
>> In fact, is the only thing that's wrong here the commit message?
>> Because it's probably trivial to just patch that away.. Hmm, but i
>> guess we'd like to hav ethe actual commit message and not just another
>> fixed one..
> There is no "actual commit message" - the entire changeset is
> synthesized by cvs2git to represent the addition of a branch tag to the
> file - i.e. the logical equivalent of a "cvs tag -b", which has no
> commit message.

There is a commit message on the trunk when the file was added there.
Is there any chance of being able to lift that message off trunk and
just copy it into the branch, instead of saying "this is a cherry-pick
of this commit over here"?

 Magnus Hagander

In response to


pgsql-hackers by date

Next:From: Max BowsherDate: 2010-08-20 17:56:25
Subject: Re: git: uh-oh
Previous:From: Max BowsherDate: 2010-08-20 17:41:59
Subject: Re: git: uh-oh

Privacy Policy | About PostgreSQL
Copyright © 1996-2017 The PostgreSQL Global Development Group