diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-01-29 13:18:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-29 13:18:52 -0800 |
| commit | 1082fb22b236201ea71fcf5e262d48796992fe72 (patch) | |
| tree | 4546dc840e2140db73b034a73a7ef374cdb74dda /Documentation | |
| parent | Merge branch 'nd/maint-refname-in-hierarchy-check' (diff) | |
| parent | git-p4: add tests demonstrating spec overlay ambiguities (diff) | |
| download | tgif-1082fb22b236201ea71fcf5e262d48796992fe72.tar.xz | |
Merge branch 'pw/p4-view-updates'
* pw/p4-view-updates:
git-p4: add tests demonstrating spec overlay ambiguities
git-p4: adjust test to adhere to stricter useClientSpec
git-p4: clarify comment
git-p4: fix verbose comment typo
git-p4: only a single ... wildcard is supported
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-p4.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 78938b2930..8b92cc0f8d 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -314,6 +314,11 @@ around whitespace. Of the possible wildcards, git-p4 only handles '...', and only when it is at the end of the path. Git-p4 will complain if it encounters an unhandled wildcard. +Bugs in the implementation of overlap mappings exist. If multiple depot +paths map through overlays to the same location in the repository, +git-p4 can choose the wrong one. This is hard to solve without +dedicating a client spec just for git-p4. + The name of the client can be given to git-p4 in multiple ways. The variable 'git-p4.client' takes precedence if it exists. Otherwise, normal p4 mechanisms of determining the client are used: environment |