diff options
| author | Pete Wyckoff <pw@padd.com> | 2012-01-11 18:31:10 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-11 16:35:39 -0800 |
| commit | 42d8c2799062bafc538d511a0262f76e23c99421 (patch) | |
| tree | a7c0b46444dcb7c72cf9afbe5f91f1ac16c6bdf4 /Documentation/git-p4.txt | |
| parent | 2ea09b5ace46bf8292afe9c2b83b4a6580218bdf (diff) | |
| download | git-42d8c2799062bafc538d511a0262f76e23c99421.tar.gz | |
git-p4: add tests demonstrating spec overlay ambiguitiespw/p4-view-updates
Introduce new tests that look more closely at overlay situations
when there are conflicting files. Five of these are broken.
Document the brokenness.
This is a fundamental problem with how git-p4 only "borrows" a
client spec. At some sync operation, a new change can contain
a file which is already in the repo or explicitly deleted through
another mapping. To sort this out would involve listing all the
files in the client spec to find one with a higher priority.
While this is not too hard for the initial import, subsequent
sync operations would be very costly.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-p4.txt')
| -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 |