From: Pete Wyckoff Date: Sun, 18 Sep 2011 01:32:36 GMT Subject: [PATCH 4/5] git-p4: stop ignoring apple filetype Message-ID: <20110918013236.GE4619@arf.padd.com> In-Reply-To: <20110918012634.GA4578@arf.padd.com> Currently "apple" filetype is ignored explicitly, and the file is not even included in the git repository. This seems wrong. Remove this, letting it be treated like a "binary" filetype. Signed-off-by: Pete Wyckoff --- contrib/fast-import/git-p4 | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 931cf5f..eee288d 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -1247,11 +1247,6 @@ class P4Sync(Command, P4UserMap): # - helper for streamP4Files def streamOneP4File(self, file, contents): - if file["type"] == "apple": - print "\nfile %s is a strange apple file that forks. Ignoring" % \ - file['depotFile'] - return - relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes) relPath = self.wildcard_decode(relPath) if verbose: -- 1.7.6.3