From: Simon Hausmann <simon@lst•de>
To: "Shawn O. Pearce" <spearce@spearce•org>
Cc: Junio C Hamano <junkio@cox•net>, git@vger•kernel.org
Subject: Re: git-p4import.py robustness changes
Date: Tue, 12 Jun 2007 23:46:56 +0200 [thread overview]
Message-ID: <200706122347.00696.simon@lst.de> (raw)
In-Reply-To: <20070604055600.GE4507@spearce.org>
[-- Attachment #1: Type: text/plain, Size: 2032 bytes --]
On Monday 04 June 2007 07:56:00 Shawn O. Pearce wrote:
> Simon Hausmann <simon@lst•de> wrote:
> > On the topic of git integration with perforce, what are the chances of
> > getting git-p4 ( http://repo.or.cz/w/fast-export.git ) into git's
> > contrib/fast-export area? :)
> >
> > git-p4 can do everything git-p4import can do plus a lot more (it can
> > track multiple branches, it's a hell of a lot faster, it can export back
> > to p4 and it also works on Windows!).
>
> I was sort of hoping we could fold the fast-export Git repository
> on repo.or.cz into core Git at some point. Right now the only
> thing in contrib/fast-export is the import-tars.perl script that
> I maintain in my fastimport repository... ;-)
>
> Like Junio I don't use Perforce, and can't test against it, but
> if you can maintain git-p4 (and I think the history on repo.or.cz
> shows that you do) then it may be a good idea to add it to core Git.
>
> Send a patch to add it. Worst that happens is both Junio and I
> decide not to apply it. Or I apply it, but Junio refuses to pull
> from me afterwards. ;-)
Ok, I'll give it a try :)
I've used git-filter-branch to rewrite the history in fast-export to include
only changes relevant to git-p4 and at the same time move all files into
contrib/fast-import. The result is available as separate branch at
git://repo.or.cz/fast-export.git git-p4
and technically merges fine into git.git's contrib/fast-import directory with
three files (git-p4, git-p4.txt and git-p4.bat for windows convenience).
Please let me know if there's anything missing or if you prefer a different
format or so. I also realized that I haven't really used the 'Signed-off-by'
tags in the past but I'd be happy to adopt it for git inclusion if you prefer
that :)
_If_ one of you decides to pull then my plan is to discontinue the git-p4
branch in the fast-export repository and instead work in a git.git fork on
repo.or.cz (similar to the fastimport repository).
Simon
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2007-06-12 21:46 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-31 16:47 git-p4import.py robustness changes Scott Lamb
2007-05-31 23:53 ` Junio C Hamano
2007-06-02 20:41 ` Scott Lamb
2007-06-02 21:33 ` Junio C Hamano
2007-06-02 23:21 ` Scott Lamb
2007-06-02 23:52 ` Junio C Hamano
2007-06-03 13:11 ` Simon Hausmann
2007-06-03 20:12 ` Scott Lamb
2007-06-04 5:54 ` Shawn O. Pearce
2007-06-04 6:09 ` Dana How
2007-06-04 6:18 ` Shawn O. Pearce
2007-06-04 7:19 ` Scott Lamb
2007-06-05 7:21 ` Simon Hausmann
2007-06-04 8:41 ` Marius Storm-Olsen
2007-06-04 5:56 ` Shawn O. Pearce
2007-06-12 21:46 ` Simon Hausmann [this message]
2007-06-13 21:06 ` Scott Lamb
2007-06-13 22:34 ` Simon Hausmann
2007-06-14 5:35 ` Shawn O. Pearce
2007-06-14 21:44 ` Simon Hausmann
2007-06-15 3:13 ` Shawn O. Pearce
2007-06-15 5:30 ` Marius Storm-Olsen, mstormo_git
2007-06-03 3:58 ` [PATCH 1/4] git-p4import: fix subcommand error handling Scott Lamb
2007-06-03 3:58 ` [PATCH 2/4] git-p4import: use lists of subcommand arguments Scott Lamb
2007-06-03 3:58 ` [PATCH 3/4] git-p4import: resume on correct p4 changeset Scott Lamb
2007-06-03 3:58 ` [PATCH 4/4] git-p4import: partial history Scott Lamb
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=200706122347.00696.simon@lst.de \
--to=simon@lst$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=junkio@cox$(echo .)net \
--cc=spearce@spearce$(echo .)org \
/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