"Kevin Grittner" wrote:
> Well, that didn't work much better.
I decided I'd reached my limit on this. I fell back to a suggestion
made a while back, and just created a patch from the old repository
and applied it to the new one. I've pushed it to the public repo,
but haven't yet had a chance
Elvis Pranskevichus wrote:
> Instead of filtering non-merge commits I would suggest doing git
> rebase on the latest revision of the old git repo. That way you
> will get a set of commits that should apply cleanly. The reason
> it is failing now is that it is impossible for git am to do a
> 3-
On September 21, 2010 07:32:57 pm Kevin Grittner wrote:
> Elvis Pranskevichus wrote:
> > # apply the "patch mailbox"
> > $ git am ../postgresql.old/patches.mbox
>
> That's not working for me.
>
> Applying: Provide two macros for categorizing current transaction
> isolation level (IsXactIsoLevelX
Elvis Pranskevichus wrote:
> # apply the "patch mailbox"
> $ git am ../postgresql.old/patches.mbox
That's not working for me.
Applying: Provide two macros for categorizing current transaction
isolation level (IsXactIsoLevelXactSnapshotBased and
IsXactIsoLevelFullySerializable) to replace the
On Tue, Sep 21, 2010 at 20:28, Peter Eisentraut wrote:
> On tis, 2010-09-21 at 20:04 +0200, Magnus Hagander wrote:
>> The cleanest is probably if I wipe the repo on git.postgresql.org for
>> you, and you then re-push from scratch.
>
> We probably need a solution that doesn't require manual interve
On tis, 2010-09-21 at 20:04 +0200, Magnus Hagander wrote:
> The cleanest is probably if I wipe the repo on git.postgresql.org for
> you, and you then re-push from scratch.
We probably need a solution that doesn't require manual intervention for
everyone separately.
--
Sent via pgsql-hackers mai
On Tue, Sep 21, 2010 at 20:16, Kevin Grittner
wrote:
> Magnus Hagander wrote:
>
>> The cleanest is probably if I wipe the repo on git.postgresql.org
>> for you, and you then re-push from scratch. Does thta work for
>> you?
>
> Sure. Thanks.
done, should be available for push now.
--
Magnus
Magnus Hagander wrote:
> The cleanest is probably if I wipe the repo on git.postgresql.org
> for you, and you then re-push from scratch. Does thta work for
> you?
Sure. Thanks.
-Kevin
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscriptio
On 21/09/10 21:01, Kevin Grittner wrote:
That still leaves me wondering how I get that out to my public git
repo without someone resetting it on the server. Or do I have the
ability to clean out the old stuff at:
ssh://g...@git.postgresql.org/users/kgrittn/postgres.git
so that I can push the r
On Tue, Sep 21, 2010 at 20:01, Kevin Grittner
wrote:
> Elvis Pranskevichus wrote:
>
>> Here's a quick and easy way to move dev history to a new repo:
>>
>> $ cd postgresql.old
>> $ git checkout yourbranch
>>
>> # stream your commits into a "patch mailbox"
>> $ git format-patch --stdout master..HE
Elvis Pranskevichus wrote:
> Here's a quick and easy way to move dev history to a new repo:
>
> $ cd postgresql.old
> $ git checkout yourbranch
>
> # stream your commits into a "patch mailbox"
> $ git format-patch --stdout master..HEAD > patches.mbox
>
> # switch to the new repo
> $ cd ../pos
At 2010-09-21 11:59:09 -0400, and...@dunslane.net wrote:
>
> However, that does mean losing the private commit history. I'm not
> sure much can be done about that, unless you migrate each commit
> separately, which could be painful.
It doesn't have to be painful.
Determine what patches from the o
On 09/21/2010 12:07 PM, Aidan Van Dyk wrote:
But probably the easiest way, if you have a nice clean history, is to
use "git formatpatch". This produces a nice "series" of patches, with
your commit message, and content, and dates, all preserved, ready for
re-applying (git am can do that automat
On September 21, 2010 12:08:49 pm Kevin Grittner wrote:
> Andrew Dunstan wrote:
> > Basically, AIUI, you have to move the old repo aside and freshly
> > clone the new repo.
>
> I was assuming that, but it's good to have confirmation. What about
> my repo at
>
> http://git.postgresql.org/gitweb?
Andrew Dunstan wrote:
> Basically, AIUI, you have to move the old repo aside and freshly
> clone the new repo.
I was assuming that, but it's good to have confirmation. What about
my repo at
http://git.postgresql.org/gitweb?p=users/kgrittn/postgres.git ?
Can that be reset to a copy of the
* Andrew Dunstan [100921 11:59]:
>
> I was just mentioning to Magnus a couple of hours ago on chat that this
> would create headaches for some people.
>
> Basically, AIUI, you have to move the old repo aside and freshly clone
> the new repo.
>
> I haven't migrated my development trees yet, bu
On 09/21/2010 11:28 AM, Kevin Grittner wrote:
I just went to do my usual merge from the git version of HEAD (at
git://git.postgresql.org/git/postgresql.git), and it seemed to be
doing an awful lot of work to prepare to attempt the merge. That
leads me to think that the newly converted git, or
On 21/09/10 18:28, Kevin Grittner wrote:
I just went to do my usual merge from the git version of HEAD (at
git://git.postgresql.org/git/postgresql.git), and it seemed to be
doing an awful lot of work to prepare to attempt the merge. That
leads me to think that the newly converted git, or a copy
I just went to do my usual merge from the git version of HEAD (at
git://git.postgresql.org/git/postgresql.git), and it seemed to be
doing an awful lot of work to prepare to attempt the merge. That
leads me to think that the newly converted git, or a copy of it, is
now at that location, which is co
19 matches
Mail list logo
