Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2012-01-12 03:31:10 +0400
committerJunio C Hamano <gitster@pobox.com>2012-01-12 04:35:39 +0400
commit42d8c2799062bafc538d511a0262f76e23c99421 (patch)
treea7c0b46444dcb7c72cf9afbe5f91f1ac16c6bdf4 /usage.c
parent2ea09b5ace46bf8292afe9c2b83b4a6580218bdf (diff)
git-p4: add tests demonstrating spec overlay ambiguities
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 'usage.c')
0 files changed, 0 insertions, 0 deletions