From: Pete Wyckoff <pw@padd•com>
To: Vitor Antunes <vitor.hda@gmail•com>
Cc: Luke Diamand <luke@diamand•org>, git@vger•kernel.org
Subject: Re: [PATCHv2 0/4] git-p4: small fixes to branches and labels; tests
Date: Sun, 4 Dec 2011 11:07:39 -0500 [thread overview]
Message-ID: <20111204160739.GA13549@arf.padd.com> (raw)
In-Reply-To: <CAOpHH-U6NxRSioRZg9_+f146vVR+S1hWsVbRmHz+vsqtz+vXiA@mail.gmail.com>
vitor.hda@gmail•com wrote on Thu, 01 Dec 2011 00:37 +0000:
> On Wed, Nov 30, 2011 at 11:00 PM, Pete Wyckoff <pw@padd•com> wrote:
> > And avoids collision with some Vitor code that will get
> > added eventually.
>
> I'm starting to doubt I will ever be able to overcome the fast-import
> limitation on not allowing branch delesetion. Sure, the code I wrote was
> garbage! But they seem to be very relunctant on the concept of deleting
> branches on the fly.
> Did you ever take a look at the patch I sent? Maybe you could help me
> shape it up a bit.
I don't think we necessarily need branch deletion inside the
fast-import. Can you go back and look at my mail from August and
see if that approach is doable? Just make a single commit on a
throwaway branch with no parent, checkpoint, then do diff-tree
for each potential parent until you find a match. Do the commit
for real where it goes. As git-p4 exits, we'll delete the branch
ref of the test commit.
If this works, we can see if fast-import can be taught to
generate a tree object without a commit to save the need for a
temporary branch.
-- Pete
next prev parent reply other threads:[~2011-12-04 16:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-30 9:03 [PATCHv2 0/4] git-p4: small fixes to branches and labels; tests Luke Diamand
2011-11-30 9:03 ` [PATCHv2 1/4] git-p4: handle p4 branches and labels containing shell chars Luke Diamand
2011-11-30 9:03 ` [PATCHv2 2/4] git-p4: cope with labels with empty descriptions Luke Diamand
2011-11-30 9:03 ` [PATCHv2 3/4] git-p4: importing labels should cope with missing owner Luke Diamand
2011-11-30 9:03 ` [PATCHv2 4/4] git-p4: add test for p4 labels Luke Diamand
2011-11-30 14:55 ` [PATCHv2 0/4] git-p4: small fixes to branches and labels; tests Vitor Antunes
2011-11-30 19:14 ` Luke Diamand
2011-11-30 19:44 ` Vitor Antunes
2011-11-30 22:58 ` Pete Wyckoff
2011-11-30 23:00 ` Pete Wyckoff
2011-12-01 0:37 ` Vitor Antunes
2011-12-04 16:07 ` Pete Wyckoff [this message]
2011-12-01 8:31 ` Luke Diamand
2011-12-01 0:33 ` Vitor Antunes
2011-12-01 4:02 ` Pete Wyckoff
[not found] ` <CAOpHH-UMdLpCPx1+D2dtQJs+=t1+0U2srKfTwBi-TEF4F7EDyw@mail.gmail.com>
2011-12-01 21:59 ` Vitor Antunes
2011-12-02 8:49 ` Luke Diamand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111204160739.GA13549@arf.padd.com \
--to=pw@padd$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=luke@diamand$(echo .)org \
--cc=vitor.hda@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox