diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-05 10:44:04 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-06 19:34:32 +1000 |
| commit | 2295407a450e296625942dd87779a58ae7acdee7 (patch) | |
| tree | 484f2df4d1d65796ca72a79e1f6d7b1387e5c1a1 /test | |
| parent | 828a2acd267412648670b864c7925314d514040e (diff) | |
update discard file changes test
Diffstat (limited to 'test')
24 files changed, 50 insertions, 35 deletions
diff --git a/test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG b/test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG index 2bdf67abb..552587d35 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG @@ -1 +1,23 @@ -three +Merge branch 'conflict' into conflict_second + +# Conflicts: +# added-them-changed-us.txt +# both-added.txt +# both-deleted.txt +# both-modded.txt +# changed-them-added-us.txt +# deleted-them.txt +# deleted-us.txt +# +# It looks like you may be committing a merge. +# If this is not correct, please remove the file +# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/discardFileChanges/actual/.git/MERGE_HEAD +# and try again. + + +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# +# On branch conflict_second +# All conflicts fixed but you are still merging. +# diff --git a/test/integration/discardFileChanges/expected/.git_keep/MERGE_HEAD b/test/integration/discardFileChanges/expected/.git_keep/MERGE_HEAD deleted file mode 100644 index 6d6a6623d..000000000 --- a/test/integration/discardFileChanges/expected/.git_keep/MERGE_HEAD +++ /dev/null @@ -1 +0,0 @@ -38b645bf2388b21695d22d7f673d87971a78e4ad diff --git a/test/integration/discardFileChanges/expected/.git_keep/MERGE_MODE b/test/integration/discardFileChanges/expected/.git_keep/MERGE_MODE deleted file mode 100644 index e69de29bb..000000000 --- a/test/integration/discardFileChanges/expected/.git_keep/MERGE_MODE +++ /dev/null diff --git a/test/integration/discardFileChanges/expected/.git_keep/MERGE_MSG b/test/integration/discardFileChanges/expected/.git_keep/MERGE_MSG deleted file mode 100644 index d6189997a..000000000 --- a/test/integration/discardFileChanges/expected/.git_keep/MERGE_MSG +++ /dev/null @@ -1,10 +0,0 @@ -Merge branch 'conflict' into conflict_second - -# Conflicts: -# added-them-changed-us.txt -# both-added.txt -# both-deleted.txt -# both-modded.txt -# changed-them-added-us.txt -# deleted-them.txt -# deleted-us.txt diff --git a/test/integration/discardFileChanges/expected/.git_keep/ORIG_HEAD b/test/integration/discardFileChanges/expected/.git_keep/ORIG_HEAD index 07e446d60..79f1c70e0 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/ORIG_HEAD +++ b/test/integration/discardFileChanges/expected/.git_keep/ORIG_HEAD @@ -1 +1 @@ -c64dd6aea3efd197ed630dedc1ffb538d35c3fdb +3633f8c997d88e0c59202f498c8344da9da3aaf4 diff --git a/test/integration/discardFileChanges/expected/.git_keep/index b/test/integration/discardFileChanges/expected/.git_keep/index Binary files differindex 684535674..d2ec8aba0 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/index +++ b/test/integration/discardFileChanges/expected/.git_keep/index diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/HEAD b/test/integration/discardFileChanges/expected/.git_keep/logs/HEAD index 84066dbf1..ea46cdc88 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/logs/HEAD +++ b/test/integration/discardFileChanges/expected/.git_keep/logs/HEAD @@ -1,7 +1,8 @@ -0000000000000000000000000000000000000000 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100 commit (initial): one -0e5c9fd43732ca064946e9c582fd6f159774db84 eb4814e3f9d5eb1869704cf4498420c9f4a141da CI <CI@example.com> 1616203051 +1100 commit: both-deleted.txt renamed in added-them-changed-us.txt -eb4814e3f9d5eb1869704cf4498420c9f4a141da 38b645bf2388b21695d22d7f673d87971a78e4ad CI <CI@example.com> 1616203051 +1100 commit: two -38b645bf2388b21695d22d7f673d87971a78e4ad 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100 checkout: moving from conflict to conflict_second -0e5c9fd43732ca064946e9c582fd6f159774db84 698e214196fed018bb4164380745dd2df3bbac74 CI <CI@example.com> 1616203051 +1100 commit: both-deleted.txt renamed in changed-them-added-us.txt -698e214196fed018bb4164380745dd2df3bbac74 c64dd6aea3efd197ed630dedc1ffb538d35c3fdb CI <CI@example.com> 1616203052 +1100 commit: three -c64dd6aea3efd197ed630dedc1ffb538d35c3fdb c64dd6aea3efd197ed630dedc1ffb538d35c3fdb CI <CI@example.com> 1616203052 +1100 reset: moving to conflict_second +0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI <CI@example.com> 1617582376 +1000 commit (initial): one +459fa5065afddb89a3dccddef39b17b5fd74d041 0776b49486a00aecd966e4d72e14edea5fad91a8 CI <CI@example.com> 1617582376 +1000 commit: both-deleted.txt renamed in added-them-changed-us.txt +0776b49486a00aecd966e4d72e14edea5fad91a8 837fbbc4ee6892b828a4a94be22c39814146aafb CI <CI@example.com> 1617582376 +1000 commit: two +837fbbc4ee6892b828a4a94be22c39814146aafb 459fa5065afddb89a3dccddef39b17b5fd74d041 CI <CI@example.com> 1617582376 +1000 checkout: moving from conflict to conflict_second +459fa5065afddb89a3dccddef39b17b5fd74d041 3247afc767cff1c98fe5277005f6653547b20fa4 CI <CI@example.com> 1617582377 +1000 commit: both-deleted.txt renamed in changed-them-added-us.txt +3247afc767cff1c98fe5277005f6653547b20fa4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI <CI@example.com> 1617582377 +1000 commit: three +3633f8c997d88e0c59202f498c8344da9da3aaf4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI <CI@example.com> 1617582377 +1000 reset: moving to conflict_second +3633f8c997d88e0c59202f498c8344da9da3aaf4 39d62c8a07e5103fef16c32373738ce92c4549b7 CI <CI@example.com> 1617582397 +1000 commit (merge): Merge branch 'conflict' into conflict_second diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict index 4827c7871..692e2161e 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict +++ b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict @@ -1,3 +1,3 @@ -0000000000000000000000000000000000000000 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100 commit (initial): one -0e5c9fd43732ca064946e9c582fd6f159774db84 eb4814e3f9d5eb1869704cf4498420c9f4a141da CI <CI@example.com> 1616203051 +1100 commit: both-deleted.txt renamed in added-them-changed-us.txt -eb4814e3f9d5eb1869704cf4498420c9f4a141da 38b645bf2388b21695d22d7f673d87971a78e4ad CI <CI@example.com> 1616203051 +1100 commit: two +0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI <CI@example.com> 1617582376 +1000 commit (initial): one +459fa5065afddb89a3dccddef39b17b5fd74d041 0776b49486a00aecd966e4d72e14edea5fad91a8 CI <CI@example.com> 1617582376 +1000 commit: both-deleted.txt renamed in added-them-changed-us.txt +0776b49486a00aecd966e4d72e14edea5fad91a8 837fbbc4ee6892b828a4a94be22c39814146aafb CI <CI@example.com> 1617582376 +1000 commit: two diff --git a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second index 0e1748048..b0bd0abaa 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second +++ b/test/integration/discardFileChanges/expected/.git_keep/logs/refs/heads/conflict_second @@ -1,3 +1,4 @@ -0000000000000000000000000000000000000000 0e5c9fd43732ca064946e9c582fd6f159774db84 CI <CI@example.com> 1616203051 +1100 branch: Created from conflict -0e5c9fd43732ca064946e9c582fd6f159774db84 698e214196fed018bb4164380745dd2df3bbac74 CI <CI@example.com> 1616203051 +1100 commit: both-deleted.txt renamed in changed-them-added-us.txt -698e214196fed018bb4164380745dd2df3bbac74 c64dd6aea3efd197ed630dedc1ffb538d35c3fdb CI <CI@example.com> 1616203052 +1100 commit: three +0000000000000000000000000000000000000000 459fa5065afddb89a3dccddef39b17b5fd74d041 CI <CI@example.com> 1617582376 +1000 branch: Created from conflict +459fa5065afddb89a3dccddef39b17b5fd74d041 3247afc767cff1c98fe5277005f6653547b20fa4 CI <CI@example.com> 1617582377 +1000 commit: both-deleted.txt renamed in changed-them-added-us.txt +3247afc767cff1c98fe5277005f6653547b20fa4 3633f8c997d88e0c59202f498c8344da9da3aaf4 CI <CI@example.com> 1617582377 +1000 commit: three +3633f8c997d88e0c59202f498c8344da9da3aaf4 39d62c8a07e5103fef16c32373738ce92c4549b7 CI <CI@example.com> 1617582397 +1000 commit (merge): Merge branch 'conflict' into conflict_second diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/07/76b49486a00aecd966e4d72e14edea5fad91a8 b/test/integration/discardFileChanges/expected/.git_keep/objects/07/76b49486a00aecd966e4d72e14edea5fad91a8 Binary files differnew file mode 100644 index 000000000..d3e23bef3 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/07/76b49486a00aecd966e4d72e14edea5fad91a8 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/0e/5c9fd43732ca064946e9c582fd6f159774db84 b/test/integration/discardFileChanges/expected/.git_keep/objects/0e/5c9fd43732ca064946e9c582fd6f159774db84 deleted file mode 100644 index 3ad31c1dc..000000000 --- a/test/integration/discardFileChanges/expected/.git_keep/objects/0e/5c9fd43732ca064946e9c582fd6f159774db84 +++ /dev/null @@ -1,2 +0,0 @@ -xA -@ @Qs cRU )x|{n?~PKܡGtOK ̔ʔkvEtW`a Z @B㍠#B G=&OP I*
\ No newline at end of file diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/32/47afc767cff1c98fe5277005f6653547b20fa4 b/test/integration/discardFileChanges/expected/.git_keep/objects/32/47afc767cff1c98fe5277005f6653547b20fa4 new file mode 100644 index 000000000..db0d71d86 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/32/47afc767cff1c98fe5277005f6653547b20fa4 @@ -0,0 +1,2 @@ +x͊0qy *IՀ |$ +z =9Mht ;@H3FcivĄ"TƤGz i^g2lVf69:Ψe|wn;ukd~ꯑ~Z_l ;|PJu<Ȃ6.D K`
\ No newline at end of file diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/36/33f8c997d88e0c59202f498c8344da9da3aaf4 b/test/integration/discardFileChanges/expected/.git_keep/objects/36/33f8c997d88e0c59202f498c8344da9da3aaf4 new file mode 100644 index 000000000..eb8cc0bf7 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/36/33f8c997d88e0c59202f498c8344da9da3aaf4 @@ -0,0 +1,2 @@ +xM +0@a9E1f3([Jo ?-.bsc#19J@_(p1$@e([UPpg<NN]ط\x7닇\Cg3G=PCx t:L
\ No newline at end of file diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/38/b645bf2388b21695d22d7f673d87971a78e4ad b/test/integration/discardFileChanges/expected/.git_keep/objects/38/b645bf2388b21695d22d7f673d87971a78e4ad Binary files differdeleted file mode 100644 index 45642dcb1..000000000 --- a/test/integration/discardFileChanges/expected/.git_keep/objects/38/b645bf2388b21695d22d7f673d87971a78e4ad +++ /dev/null diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/39/d62c8a07e5103fef16c32373738ce92c4549b7 b/test/integration/discardFileChanges/expected/.git_keep/objects/39/d62c8a07e5103fef16c32373738ce92c4549b7 Binary files differnew file mode 100644 index 000000000..fc8fb22d3 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/39/d62c8a07e5103fef16c32373738ce92c4549b7 diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/45/9fa5065afddb89a3dccddef39b17b5fd74d041 b/test/integration/discardFileChanges/expected/.git_keep/objects/45/9fa5065afddb89a3dccddef39b17b5fd74d041 new file mode 100644 index 000000000..707cdfc06 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/45/9fa5065afddb89a3dccddef39b17b5fd74d041 @@ -0,0 +1,3 @@ +x +0 a}IT1ikǨG[ww52ZJbt-n `h; e$ă + QI?yho?P*
\ No newline at end of file diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/69/8e214196fed018bb4164380745dd2df3bbac74 b/test/integration/discardFileChanges/expected/.git_keep/objects/69/8e214196fed018bb4164380745dd2df3bbac74 Binary files differdeleted file mode 100644 index de9f05a03..000000000 --- a/test/integration/discardFileChanges/expected/.git_keep/objects/69/8e214196fed018bb4164380745dd2df3bbac74 +++ /dev/null diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/83/7fbbc4ee6892b828a4a94be22c39814146aafb b/test/integration/discardFileChanges/expected/.git_keep/objects/83/7fbbc4ee6892b828a4a94be22c39814146aafb Binary files differnew file mode 100644 index 000000000..63bd1c8d9 --- /dev/null +++ b/test/integration/discardFileChanges/expected/.git_keep/objects/83/7fbbc4ee6892b828a4a94be22c39814146aafb diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/c6/4dd6aea3efd197ed630dedc1ffb538d35c3fdb b/test/integration/discardFileChanges/expected/.git_keep/objects/c6/4dd6aea3efd197ed630dedc1ffb538d35c3fdb deleted file mode 100644 index 5da5ff4bc..000000000 --- a/test/integration/discardFileChanges/expected/.git_keep/objects/c6/4dd6aea3efd197ed630dedc1ffb538d35c3fdb +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9ELd"BW=F&`l)<=_ ƮjTZȹ=" E)Za]ÆJ1E<jڜH.ћubroK/e7 @
s7q':G
\ No newline at end of file diff --git a/test/integration/discardFileChanges/expected/.git_keep/objects/eb/4814e3f9d5eb1869704cf4498420c9f4a141da b/test/integration/discardFileChanges/expected/.git_keep/objects/eb/4814e3f9d5eb1869704cf4498420c9f4a141da deleted file mode 100644 index 1d1e8b355..000000000 --- a/test/integration/discardFileChanges/expected/.git_keep/objects/eb/4814e3f9d5eb1869704cf4498420c9f4a141da +++ /dev/null @@ -1 +0,0 @@ -xAj0E)f_ F$[PJ! c$}Ձr:7=╭;@9K.1[NmA6%D4N]vJPR~FWO>"0Vc!MyF l;/u)~éllҧǔME=SXJוVA, {E VJK
\ No newline at end of file diff --git a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict index 6d6a6623d..4a6184f26 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict +++ b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict @@ -1 +1 @@ -38b645bf2388b21695d22d7f673d87971a78e4ad +837fbbc4ee6892b828a4a94be22c39814146aafb diff --git a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second index 07e446d60..79ace5379 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second +++ b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second @@ -1 +1 @@ -c64dd6aea3efd197ed630dedc1ffb538d35c3fdb +39d62c8a07e5103fef16c32373738ce92c4549b7 diff --git a/test/integration/discardFileChanges/recording.json b/test/integration/discardFileChanges/recording.json index f5f9dbc7a..4b64e16f0 100644 --- a/test/integration/discardFileChanges/recording.json +++ b/test/integration/discardFileChanges/recording.json @@ -1 +1 @@ -[{"Timestamp":23,"Event":{"Type":1,"Mod":0,"Key":0,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":0,"Bytes":null}},{"Timestamp":377,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":481,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":593,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":713,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":816,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":952,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1057,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":1185,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1305,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":1425,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1537,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":1673,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1760,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":1897,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":1992,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":2129,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":2225,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":2361,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":2473,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":2592,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":2705,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":2825,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":2937,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":3065,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":3185,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":3297,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":3409,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":3537,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":3641,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":3777,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":3873,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":4008,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":4121,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":4233,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":4345,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":4449,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":4751,"Event":{"Type":0,"Mod":0,"Key":27,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Gw=="}}]
\ No newline at end of file +{"KeyEvents":[{"Timestamp":966,"Mod":0,"Key":256,"Ch":100},{"Timestamp":1564,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2093,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2621,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3173,"Mod":0,"Key":256,"Ch":100},{"Timestamp":3652,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4165,"Mod":0,"Key":256,"Ch":100},{"Timestamp":4629,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5190,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5686,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6198,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6733,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7254,"Mod":0,"Key":256,"Ch":100},{"Timestamp":7789,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8285,"Mod":0,"Key":256,"Ch":100},{"Timestamp":8773,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9237,"Mod":0,"Key":256,"Ch":100},{"Timestamp":9725,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10181,"Mod":0,"Key":256,"Ch":100},{"Timestamp":10653,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11125,"Mod":0,"Key":256,"Ch":100},{"Timestamp":11621,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12093,"Mod":0,"Key":256,"Ch":100},{"Timestamp":12565,"Mod":0,"Key":13,"Ch":13},{"Timestamp":13037,"Mod":0,"Key":256,"Ch":100},{"Timestamp":13509,"Mod":0,"Key":13,"Ch":13},{"Timestamp":13965,"Mod":0,"Key":256,"Ch":100},{"Timestamp":14461,"Mod":0,"Key":13,"Ch":13},{"Timestamp":14909,"Mod":0,"Key":256,"Ch":100},{"Timestamp":15382,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15853,"Mod":0,"Key":256,"Ch":100},{"Timestamp":16325,"Mod":0,"Key":13,"Ch":13},{"Timestamp":16765,"Mod":0,"Key":256,"Ch":100},{"Timestamp":17222,"Mod":0,"Key":13,"Ch":13},{"Timestamp":17637,"Mod":0,"Key":256,"Ch":100},{"Timestamp":18077,"Mod":0,"Key":13,"Ch":13},{"Timestamp":20190,"Mod":0,"Key":256,"Ch":109},{"Timestamp":20447,"Mod":0,"Key":13,"Ch":13},{"Timestamp":21414,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":127,"Height":23}]}
\ No newline at end of file diff --git a/test/integration/discardFileChanges/test.json b/test/integration/discardFileChanges/test.json index 7a06a6c50..9c2851120 100644 --- a/test/integration/discardFileChanges/test.json +++ b/test/integration/discardFileChanges/test.json @@ -1 +1 @@ -{ "description": "discard file changes for various kinds of situations (merge conflicts, etc)", "speed": 2 } +{ "description": "discard file changes for various kinds of situations (merge conflicts, etc)", "speed": 3 } |