diff options
| author |  Luke Diamand <luke@diamand.org> | 2015-04-04 09:46:02 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-04-04 12:41:51 -0700 |
| commit | d077c2db8db64c931976391afee6c35828868a11 (patch) | |
| tree | c7b26d4f5b76e2c4b03d42390cd4fa4c6aa8f726 /mergetools/gvimdiff2 | |
| parent | git-p4: fix small bug in locked test scripts (diff) | |
| download | tgif-d077c2db8db64c931976391afee6c35828868a11.tar.xz | |
git-p4: small fix for locked-file-move-test
The test for handling of failure when trying to move a file
that is locked by another client was not quite correct - it
failed early on because the target file in the move already
existed.
The test now fails because git-p4 does not properly detect
that p4 has rejected the move, and instead just crashes. At
present, git-p4 has no support for detecting that a file
has been locked and reporting it to the user, so this is
the expected outcome.
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/gvimdiff2')
0 files changed, 0 insertions, 0 deletions