On 21 May 2018 at 23:09, Luke Diamand <luke@xxxxxxxxxxx> wrote: > On 21 May 2018 at 22:39, SZEDER Gábor <szeder.dev@xxxxxxxxx> wrote: >>> diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh > > ... > ... > >>> +' >> >> This test fails on my box and on Travis CI (in all four standard Linux >> and OSX build jobs) with: >> >> + cd /home/szeder/src/git/t/trash directory.t9832-unshelve/cli >> + p4 edit file1 >> //depot/file1#1 - opened for edit >> + echo a change >> + echo new file >> + p4 add file2 >> //depot/file2#1 - opened for add >> + p4 delete file_to_delete >> //depot/file_to_delete#1 - opened for delete >> + p4 opened >> //depot/file1#1 - edit default change (text) >> //depot/file2#1 - add default change (text) >> //depot/file_to_delete#1 - delete default change (text) >> + p4 shelve -i >> Change 3 created with 3 open file(s). >> Shelving files for change 3. >> edit //depot/file1#1 >> add //depot/file2#1 >> delete //depot/file_to_delete#1 >> Change 3 files shelved. >> + cd /home/szeder/src/git/t/trash directory.t9832-unshelve/git >> + last_shelved_change >> + p4 changes -s shelved -m1 >> + cut -d -f 2 >> + change=3 >> + git p4 unshelve 3 >> Traceback (most recent call last): >> File "/home/szeder/src/git/git-p4", line 3975, in <module> >> main() >> File "/home/szeder/src/git/git-p4", line 3969, in main >> if not cmd.run(args): >> File "/home/szeder/src/git/git-p4", line 3851, in run >> sync.importChanges(changes, shelved=True, >> origin_revision=origin_revision) >> File "/home/szeder/src/git/git-p4", line 3296, in importChanges >> files = self.extractFilesFromCommit(description, shelved, change, >> origin_revision) >> File "/home/szeder/src/git/git-p4", line 2496, in >> extractFilesFromCommit >> not self.cmp_shelved(path, file["rev"], origin_revision): >> File "/home/szeder/src/git/git-p4", line 2467, in cmp_shelved >> return ret["status"] == "identical" >> KeyError: 'status' >> error: last command exited with $?=1 >> not ok 4 - create shelved changelist > > It works fine for me - but given where it's failing, my first > suspicion would be p4 client version (or server) differences. > > I'm using 2015.1 for server and client. Could you check which version > you are using? In fact, no need. It works fine with 2015.1 but 2017.1 fails with this error. Sigh. I'll reroll. Luke > > Thanks, > Luke
