From f8efa7b18865ae0de0da071ac08e4d402eb719c9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 16 Jul 2007 00:06:14 +0000 Subject: [PATCH] Autogenerated manpages for v1.5.3-rc2 --- man1/git-p4import.1 | 107 -------------------------------------------- 1 file changed, 107 deletions(-) delete mode 100644 man1/git-p4import.1 diff --git a/man1/git-p4import.1 b/man1/git-p4import.1 deleted file mode 100644 index 675b22d7e..000000000 --- a/man1/git-p4import.1 +++ /dev/null @@ -1,107 +0,0 @@ -.\" ** You probably do not want to edit this file directly ** -.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). -.\" Instead of manually editing it, you probably should edit the DocBook XML -.\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-P4IMPORT" "1" "06/16/2007" "Git 1.5.2.2.236.g952c8" "Git Manual" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "NAME" -git\-p4import \- Import a Perforce repository into git -.SH "SYNOPSIS" -.sp -.nf -git\-p4import [\-q|\-v] [\-\-notags] [\-\-authors ] [\-t ] - -git\-p4import \-\-stitch -git\-p4import -.fi -.SH "DESCRIPTION" -Import a Perforce repository into an existing git repository. When a and are specified a new branch with the given name will be created and the initial import will begin. - -Once the initial import is complete you can do an incremental import of new commits from the Perforce repository. You do this by checking out the appropriate git branch and then running git\-p4import without any options. - -The standard p4 client is used to communicate with the Perforce repository; it must be configured correctly in order for git\-p4import to operate (see below). -.SH "OPTIONS" -.TP -\-q -Do not display any progress information. -.TP -\-v -Give extra progress information. -.TP -\-\-authors -Specify an authors file containing a mapping of Perforce user ids to full names and email addresses (see Notes below). -.TP -\-\-notags -Do not create a tag for each imported commit. -.TP -\-\-stitch -Import the contents of the given perforce branch into the currently checked out git branch. -.TP -\-\-log -Store debugging information in the specified file. -.TP -\-t -Specify that the remote repository is in the specified timezone. Timezone must be in the format "US/Pacific" or "Europe/London" etc. You only need to specify this once, it will be saved in the git config file for the repository. -.TP - -The Perforce path that will be imported into the specified branch. -.TP - -The new branch that will be created to hold the Perforce imports. -.SH "P4 CLIENT" -You must make the p4 client command available in your $PATH and configure it to communicate with the target Perforce repository. Typically this means you must set the "$P4PORT" and "$P4CLIENT" environment variables. - -You must also configure a p4 client "view" which maps the Perforce branch into the top level of your git repository, for example: -.sp -.nf -Client: myhost - -Root: /home/sean/import - -Options: noallwrite clobber nocompress unlocked modtime rmdir - -View: - //public/jam/... //myhost/jam/... -.fi -With the above p4 client setup, you could import the "jam" perforce branch into a branch named "jammy", like so: -.sp -.nf -$ mkdir \-p /home/sean/import/jam -$ cd /home/sean/import/jam -$ git init -$ git p4import //public/jam jammy -.fi -.SH "MULTIPLE BRANCHES" -Note that by creating multiple "views" you can use git\-p4import to import additional branches into the same git repository. However, the p4 client has a limitation in that it silently ignores all but the last "view" that maps into the same local directory. So the following will \fBnot\fR work: -.sp -.nf -View: - //public/jam/... //myhost/jam/... - //public/other/... //myhost/jam/... - //public/guest/... //myhost/jam/... -.fi -If you want more than one Perforce branch to be imported into the same directory you must employ a workaround. A simple option is to adjust your p4 client before each import to only include a single view. - -Another option is to create multiple symlinks locally which all point to the same directory in your git repository and then use one per "view" instead of listing the actual directory. -.SH "TAGS" -A git tag of the form p4/xx is created for every change imported from the Perforce repository where xx is the Perforce changeset number. Therefore after the import you can use git to access any commit by its Perforce number, e.g. git show p4/327. - -The tag associated with the HEAD commit is also how git\-p4import determines if there are new changes to incrementally import from the Perforce repository. - -If you import from a repository with many thousands of changes you will have an equal number of p4/xxxx git tags. Git tags can be expensive in terms of disk space and repository operations. If you don't need to perform further incremental imports, you may delete the tags. -.SH "NOTES" -You can interrupt the import (e.g. ctrl\-c) at any time and restart it without worry. - -Author information is automatically determined by querying the Perforce "users" table using the id associated with each change. However, if you want to manually supply these mappings you can do so with the "\-\-authors" option. It accepts a file containing a list of mappings with each line containing one mapping in the format: -.sp -.nf - perforce_id = Full Name -.fi -.SH "AUTHOR" -Written by Sean Estabrooks -.SH "GIT" -Part of the \fBgit\fR(7) suite - -- 2.26.2