From: | Marko Kreen <markokr(at)gmail(dot)com> |
---|---|
To: | Aidan Van Dyk <aidan(at)highrise(dot)ca> |
Cc: | Magnus Hagander <magnus(at)hagander(dot)net>, Robert Haas <robertmhaas(at)gmail(dot)com>, Greg Stark <stark(at)enterprisedb(dot)com>, Andres Freund <andres(at)anarazel(dot)de>, Markus Wanner <markus(at)bluegap(dot)ch>, Heikki Linnakangas <heikki(dot)linnakangas(at)enterprisedb(dot)com>, Andrew Dunstan <andrew(at)dunslane(dot)net>, PostgreSQL-development <pgsql-hackers(at)postgresql(dot)org> |
Subject: | Re: PostgreSQL Developer meeting minutes up |
Date: | 2009-06-03 15:07:14 |
Message-ID: | e51f66da0906030807y7295bf61va34b1b7646af2675@mail.gmail.com |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-hackers |
On 6/3/09, Aidan Van Dyk <aidan(at)highrise(dot)ca> wrote:
> * Marko Kreen <markokr(at)gmail(dot)com> [090603 10:26]:
> > Thats true, but it's not representable in VCS, unless you use cherry-pick,
> > which is just UI around patch transport. But considering separate
> > local trees (with can optionally contain local per-fix branches),
> > it is possible to separate the fix-developement from final representation.
>
>
> I'll note that in git, cherry-pick is *more* than just "patch
> transport". I would more call it "patch commute". It does actually
> look at the history between the "pick"ed patch, and the current
> tree, any merge/fork points, and the differences on each path that lead
> to the changes in the current tree and the picked patch.
Well, thats good to know, but this also seems to mean it's rather bad
tool for back-patching, as you risk including random unwanted commits
too that happened in the HEAD meantime. But also, it's very good
tool for forward-patching.
But my point was not about that - rather I was pointing out that
this "patch-commute" will result in duplicate commits, that have
no ties in DAG.
--
marko
From | Date | Subject | |
---|---|---|---|
Next Message | Dave Page | 2009-06-03 15:17:11 | Re: Managing multiple branches in git |
Previous Message | Alvaro Herrera | 2009-06-03 15:01:40 | Re: Managing multiple branches in git |