diff options
| author | Gary Gibbons <ggibbons@perforce.com> | 2012-01-03 00:05:51 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-03 23:10:02 +0100 |
| commit | df5ed9077f18985a73f00fe2bacc2961598f73dc (patch) | |
| tree | ac15614472351175a06e872da6f96427dd175291 /t/t9809-git-p4-client-view.sh | |
| parent | git-p4: fix test for unsupported P4 Client Views (diff) | |
| download | git-df5ed9077f18985a73f00fe2bacc2961598f73dc.tar.xz git-df5ed9077f18985a73f00fe2bacc2961598f73dc.zip | |
git-p4: sort client views by reverse View number
Correct view sorting to support the Perforce order,
where client views are ordered and later views
override earlier view mappings.
[pw: one test now succeeds]
Signed-off-by: Gary Gibbons <ggibbons@perforce.com>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9809-git-p4-client-view.sh')
| -rwxr-xr-x | t/t9809-git-p4-client-view.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9809-git-p4-client-view.sh b/t/t9809-git-p4-client-view.sh index cbf2213e96..06652cbf4f 100755 --- a/t/t9809-git-p4-client-view.sh +++ b/t/t9809-git-p4-client-view.sh @@ -133,7 +133,7 @@ test_expect_failure 'single file map' ' git_verify $files ' -test_expect_failure 'later mapping takes precedence (entire repo)' ' +test_expect_success 'later mapping takes precedence (entire repo)' ' client_view "//depot/dir1/... //client/cli1/..." \ "//depot/... //client/cli2/..." && files="cli2/dir1/file11 cli2/dir1/file12 |