h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-12 14:51:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

history --merge to properly interleave items

Browse Source 
Fixes #2312
This commit is contained in:
ridiculousfish
2016-06-23 22:02:39 -07:00
parent 9c53019d95
commit 02cef2da23
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/fish_tests.cpp
View File

@@ -2721,6 +2721,17 @@ void history_tests_t::test_history_merge(void) {
for (size_t i = 0; i < count; i++) {
hists[i]->incorporate_external_changes();
}
// Everyone should also have items in the same order (#2312)
wcstring string_rep;
hists[0]->get_string_representation(&string_rep, L"\n");
for (size_t i = 0; i < count; i++) {
wcstring string_rep2;
hists[i]->get_string_representation(&string_rep2, L"\n");
do_test(string_rep == string_rep2);
}
// Add some more per-history items.
for (size_t i = 0; i < count; i++) {
hists[i]->add(alt_texts[i]);