Google Git
Sign in
googlers / jrn / git / 41771fa435a44ff8be3f23753bde0309a2a65b03 / t / t6423-merge-rename-directories.sh
  1. 2b86c10 merge-ort: fix bug with dir rename vs change dir to symlink by Elijah Newren · 2 years, 5 months ago
  2. 6693fb3 t64xx: convert 'test_create_repo' to 'git init' by Elijah Newren · 2 years, 7 months ago
  3. 751e165 merge-ort: fix issue with dual rename and add/add conflict by Elijah Newren · 2 years, 8 months ago
  4. 0565cee t6423: add tests of dual directory rename plus add/add conflict by Elijah Newren · 2 years, 8 months ago
  5. c614beb t6423-merge-rename-directories.sh: use the $(...) construct by Elia Pinto · 3 years ago
  6. 8b09a90 merge-ort: restart merge with cached renames to reduce process entry cost by Elijah Newren · 3 years, 8 months ago
  7. d3b88be Merge branch 'en/merge-dir-rename-corner-case-fix' by Junio C Hamano · 3 years, 8 months ago
  8. 89efac8 Merge branch 'en/ort-perf-batch-12' by Junio C Hamano · 3 years, 8 months ago
  9. 3585d0e merge-recursive: handle rename-to-self case by Elijah Newren · 3 years, 8 months ago
  10. a492d53 merge-ort: ensure we consult df_conflict and path_conflicts by Elijah Newren · 3 years, 8 months ago
  11. 806f832 t6423: test directory renames causing rename-to-self by Elijah Newren · 3 years, 8 months ago
  12. 169914e Merge branch 'en/ort-perf-batch-11' by Junio C Hamano · 3 years, 9 months ago
  13. 356da0f Fix various issues found in comments by Elijah Newren · 3 years, 9 months ago
  14. 15f3e1e t6423: rename file within directory that other side renamed by Elijah Newren · 3 years, 10 months ago
  15. 7bec8e7 Merge branch 'en/ort-readiness' by Junio C Hamano · 3 years, 11 months ago
  16. 1b31224 Merge branch 'en/ort-perf-batch-9' by Junio C Hamano · 4 years ago
  17. 259490e t6423: mark remaining expected failure under merge-ort as such by Elijah Newren · 4 years ago
  18. 32a56df merge-ort: precompute subset of sources for which we need rename detection by Elijah Newren · 4 years ago
  19. a926c4b tests: remove most uses of C_LOCALE_OUTPUT by Ævar Arnfjörð Bjarmason · 4 years, 1 month ago
  20. 848a856 t6423: add more details about direct resolution of directories by Elijah Newren · 4 years, 4 months ago
  21. fd15863 t6423: note improved ort handling with untracked files by Elijah Newren · 4 years, 4 months ago
  22. 23bef2e t6423, t6436: note improved ort handling with dirty files by Elijah Newren · 4 years, 4 months ago
  23. c12d1f2 t6423: expect improved conflict markers labels in the ort backend by Elijah Newren · 4 years, 4 months ago
  24. 727c75b t6404, t6423: expect improved rename/delete handling in ort backend by Elijah Newren · 4 years, 4 months ago
  25. ef52778 merge tests: expect improved directory/file conflict handling in ort by Elijah Newren · 4 years, 4 months ago
  26. f06481f t/: new helper for tests that pass with ort but fail with recursive by Elijah Newren · 4 years, 4 months ago
  27. c64432a t6423: more involved rules for renaming directories into each other by Elijah Newren · 4 years, 5 months ago
  28. 8536821 t6423: update directory rename detection tests with new rule by Elijah Newren · 4 years, 5 months ago
  29. 902c521 t6423: more involved directory rename test by Elijah Newren · 4 years, 5 months ago
  30. e8eb99d t642[23]: be more flexible for add/add conflicts involving pair renames by Elijah Newren · 4 years, 7 months ago
  31. 1cb5887 t6423: add an explanation about why one of the tests does not pass by Elijah Newren · 4 years, 7 months ago
  32. 6c74948 t6416, t6423: clarify some comments and fix some typos by Elijah Newren · 4 years, 7 months ago
  33. a0601b2 t6423: fix test setup for a couple tests by Elijah Newren · 4 years, 7 months ago
  34. 919df31 Collect merge-related tests to t64xx by Elijah Newren · 4 years, 7 months ago[Renamed from t/t6043-merge-rename-directories.sh]
  35. d3096d2 Merge branch 'en/doc-typofix' by Junio C Hamano · 5 years ago
  36. 7a40cf1 Fix spelling errors in comments of testcases by Elijah Newren · 5 years ago
  37. da1e295 t604[236]: do not run setup in separate tests by Elijah Newren · 5 years ago
  38. 49b8133a merge-recursive: fix merging a subdirectory into the root directory by Elijah Newren · 5 years ago
  39. ff6d547 merge-recursive: avoid directory rename detection in recursive case by Elijah Newren · 6 years ago
  40. 8c8e5bd merge-recursive: switch directory rename detection default by Elijah Newren · 6 years ago
  41. e0612a1 t6043: fix copied test description to match its purpose by Elijah Newren · 6 years ago
  42. b8cd1bb t6036, t6043: increase code coverage for file collision handling by Elijah Newren · 6 years ago
  43. 48c9cb9 merge-recursive: improve rename/rename(1to2)/add[/add] handling by Elijah Newren · 6 years ago
  44. bbafc9c merge-recursive: improve handling for rename/rename(2to1) conflicts by Elijah Newren · 6 years ago
  45. c8ce376 t6000-t6999: fix broken &&-chains by Eric Sunshine · 7 years ago
  46. 1de70db merge-recursive: fix check for skipability of working tree updates by Elijah Newren · 7 years ago
  47. 6e7e027 merge-recursive: avoid spurious rename/rename conflict from dir renames by Elijah Newren · 7 years ago
  48. bc71c4e directory rename detection: new testcases showcasing a pair of bugs by Elijah Newren · 7 years ago
  49. 18797a3 merge-recursive: fix remaining directory rename + dirty overwrite cases by Elijah Newren · 7 years ago
  50. 64b1abe merge-recursive: fix overwriting dirty files involved in renames by Elijah Newren · 7 years ago
  51. 79c4759 merge-recursive: avoid clobbering untracked files with directory renames by Elijah Newren · 7 years ago
  52. 9c0743f merge-recursive: apply necessary modifications for directory renames by Elijah Newren · 7 years ago
  53. f6f7755 merge-recursive: check for file level conflicts then get new name by Elijah Newren · 7 years ago
  54. a7a4360 directory rename detection: tests for handling overwriting dirty files by Elijah Newren · 7 years ago
  55. a0b0a15 directory rename detection: tests for handling overwriting untracked files by Elijah Newren · 7 years ago
  56. 792e137 directory rename detection: miscellaneous testcases to complete coverage by Elijah Newren · 7 years ago
  57. 362ab31 directory rename detection: testcases exploring possibly suboptimal merges by Elijah Newren · 7 years ago
  58. f95de96 directory rename detection: more involved edge/corner testcases by Elijah Newren · 7 years ago
  59. f349987 directory rename detection: testcases checking which side did the rename by Elijah Newren · 7 years ago
  60. c449947 directory rename detection: files/directories in the way of some renames by Elijah Newren · 7 years ago
  61. de632e4 directory rename detection: partially renamed directory testcase/discussion by Elijah Newren · 7 years ago
  62. 21b5373 directory rename detection: testcases to avoid taking detection too far by Elijah Newren · 7 years ago
  63. 509555d directory rename detection: directory splitting testcases by Elijah Newren · 7 years ago
  64. 04550ab directory rename detection: basic testcases by Elijah Newren · 7 years ago
  65. 8b026ed Revert "Merge branch 'en/rename-directory-detection'" by Junio C Hamano · 7 years ago
  66. c5b761f merge-recursive: ensure we write updates for directory-renamed file by Elijah Newren · 7 years ago
  67. febb3a8 merge-recursive: avoid spurious rename/rename conflict from dir renames by Elijah Newren · 7 years ago
  68. 8f581e3 directory rename detection: new testcases showcasing a pair of bugs by Elijah Newren · 7 years ago
  69. bbafab7 merge-recursive: fix remaining directory rename + dirty overwrite cases by Elijah Newren · 7 years ago
  70. e0052f4 merge-recursive: fix overwriting dirty files involved in renames by Elijah Newren · 7 years ago
  71. 7b3d3b0 merge-recursive: avoid clobbering untracked files with directory renames by Elijah Newren · 7 years ago
  72. 3b9616f merge-recursive: apply necessary modifications for directory renames by Elijah Newren · 7 years ago
  73. 79d49b7 merge-recursive: check for file level conflicts then get new name by Elijah Newren · 7 years ago
  74. e04d4a2 directory rename detection: tests for handling overwriting dirty files by Elijah Newren · 7 years ago
  75. 1619442 directory rename detection: tests for handling overwriting untracked files by Elijah Newren · 7 years ago
  76. 9746b8b directory rename detection: miscellaneous testcases to complete coverage by Elijah Newren · 7 years ago
  77. a53ab7e directory rename detection: testcases exploring possibly suboptimal merges by Elijah Newren · 7 years ago
  78. faac7ad directory rename detection: more involved edge/corner testcases by Elijah Newren · 7 years ago
  79. 4f41806 directory rename detection: testcases checking which side did the rename by Elijah Newren · 7 years ago
  80. 65fa355 directory rename detection: files/directories in the way of some renames by Elijah Newren · 7 years ago
  81. 881e48b directory rename detection: partially renamed directory testcase/discussion by Elijah Newren · 7 years ago
  82. cea6be0 directory rename detection: testcases to avoid taking detection too far by Elijah Newren · 7 years ago
  83. 740e4bd directory rename detection: directory splitting testcases by Elijah Newren · 7 years ago
  84. eabbebf directory rename detection: basic testcases by Elijah Newren · 7 years ago