diff options
| author | Pete Wyckoff <pw@padd.com> | 2014-01-21 23:16:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-22 16:06:19 (GMT) |
| commit | 3d5388afa856fde3efff023f5b672005834e7ca1 (patch) | |
| tree | 7704607d2389103e81c1b9ec6fd757d68590f156 /git-merge-octopus.sh | |
| parent | 2000544330d5b047074d8043042f7cc66157f8f5 (diff) | |
| download | git-3d5388afa856fde3efff023f5b672005834e7ca1.zip git-3d5388afa856fde3efff023f5b672005834e7ca1.tar.gz git-3d5388afa856fde3efff023f5b672005834e7ca1.tar.bz2 | |
git p4 test: examine behavior with locked (+l) files
The p4 server can enforce file locking, so that only one user
can edit a file at a time. Git p4 is unable to submit changes
to locked files. Currently it exits poorly. Ideally it would
notice the locked condition and clean up nicely.
Add a bunch of tests that describe the problem, hoping that
fixes appear in the future.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions