| commit | 42d8c2799062bafc538d511a0262f76e23c99421 | |
| author | Pete Wyckoff <pw@padd.com> | |
| Wed, 11 Jan 2012 23:31:10 +0000 (11 18:31 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 12 Jan 2012 00:35:39 +0000 (11 16:35 -0800) | ||
| tree | a7c0b46444dcb7c72cf9afbe5f91f1ac16c6bdf4 | treesnapshot (tar.gz zip) |
| parent | 2ea09b5ace46bf8292afe9c2b83b4a6580218bdf | commitdiff |
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>
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>
| Documentation/git-p4.txt | diffblobblamehistory | |
| t/t9809-git-p4-client-view.sh | diffblobblamehistory |