diff options
| author | Ian Wienand <ianw@vmware.com> | 2011-02-11 16:33:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-14 10:34:49 -0800 |
| commit | 3952710bfaa46917fd0c3a9b29d076ec013d6b6a (patch) | |
| tree | e94e243b20443d8a32cd3a2221b9d504565cf380 /contrib/fast-import/git-p4.txt | |
| parent | cbef0db6ccf6e2e57ffe74ba73dc91a0fbbf5760 (diff) | |
| download | git-3952710bfaa46917fd0c3a9b29d076ec013d6b6a.tar.gz git-3952710bfaa46917fd0c3a9b29d076ec013d6b6a.tar.xz | |
Obey p4 views when using client spec
When using the p4 client spec, this attempts to obey the client's
output preferences.
For example, a view like
//depot/foo/branch/... //client/branch/foo/...
//depot/bar/branch/... //client/branch/bar/...
will result in a directory layout in the git tree of
branch/
branch/foo
branch/bar
p4 can do various other reordering that this change doesn't support,
but we should detect it and at least fail nicely.
Signed-off-by: Ian Wienand <ianw@vmware.com>
Acked-by: Pete Wyckoff <pw@padd.com>
Acked-by: Tor Arvid Lund <torarvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/fast-import/git-p4.txt')
| -rw-r--r-- | contrib/fast-import/git-p4.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/contrib/fast-import/git-p4.txt b/contrib/fast-import/git-p4.txt index 49b335921..e09da445b 100644 --- a/contrib/fast-import/git-p4.txt +++ b/contrib/fast-import/git-p4.txt @@ -191,6 +191,11 @@ git-p4.useclientspec git config [--global] git-p4.useclientspec false +The P4CLIENT environment variable should be correctly set for p4 to be +able to find the relevant client. This client spec will be used to +both filter the files cloned by git and set the directory layout as +specified in the client (this implies --keep-path style semantics). + Implementation Details... ========================= |