git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/3] t6423: add tests of dual directory rename plus add/add conflict

From
Elijah Newren <newren@gmail.com>
Date
Jul 1, 2022, 02:57 UTC
Message-ID
<CABPp-BEZqATCZdqO0xzwZnS5TTu=4z_-h9yusJmhvxHs-kHUzA@mail.gmail.com>
In-Reply-To
<20220630223250.2843332-1-jonathantanmy@google.com>
On Thu, Jun 30, 2022 at 3:32 PM Jonathan Tan <jonathantanmy@google.com> wrote:
Show 16 quoted lines
>
> Elijah Newren <newren@gmail.com> writes:
> > Ah, I can see you've looked at this very closely.  Thanks for digging
> > in!   I know it's counter-intuitive at first, but the file is
> > necessary in order to get the sub1/ -> sub3/ rename.  The reasoning is
> > as follows: We don't need to detect a directory rename for a directory
> > where the other side added no new files into that directory...because
> > the whole point of directory renames is to move new files in a
> > directory to the new location.  Therefore, no new files in the
> > directory on one side, means no need to detect a directory rename for
> > it on the other side.  For a deeper discussion of this, see commit
> > c64432aacd (t6423: more involved rules for renaming directories into
> > each other, 2020-10-15).
>
> Thanks! This makes sense. Might be worth including as a comment
> (explaining why "newfile" is there) in the test.
Sure, will do.
Previous: Jonathan TanNext: Calvin Wan
Message 6 of 45 in “Fix dual rename into each other plus conflicting adds”
  1. 0/3 Fix dual rename into each other plus conflicting addsElijah Newren via GitGitGadget, Jun 22, 2022
  2. 1/3 t6423: add tests of dual directory rename plus add/add conflictElijah Newren via GitGitGadget, Jun 22, 2022
  3. Jonathan TanJun 27, 2022
  4. Elijah NewrenJun 30, 2022
  5. Jonathan TanJun 30, 2022
  6. Elijah NewrenJul 1, 2022
  7. Calvin WanJun 27, 2022
  8. Elijah NewrenJun 30, 2022
  9. 2/3 merge-ort: shuffle the computation and cleanup of potential collisionsElijah Newren via GitGitGadget, Jun 22, 2022
  10. Jonathan TanJun 27, 2022
  11. Calvin WanJun 27, 2022
  12. Elijah NewrenJun 30, 2022
  13. 3/3 merge-ort: fix issue with dual rename and add/add conflictElijah Newren via GitGitGadget, Jun 22, 2022
  14. Jonathan TanJun 27, 2022
  15. Elijah NewrenJun 30, 2022
  16. Jonathan TanJul 6, 2022
  17. Elijah NewrenJun 22, 2022
  18. 0/3 Fix dual rename into each other plus conflicting addsElijah Newren via GitGitGadget, Jun 30, 2022
  19. 1/3 t6423: add tests of dual directory rename plus add/add conflictElijah Newren via GitGitGadget, Jun 30, 2022
  20. Ævar Arnfjörð BjarmasonJun 30, 2022
  21. Elijah NewrenJul 1, 2022
  22. Ævar Arnfjörð BjarmasonJul 1, 2022
  23. 2/3 merge-ort: shuffle the computation and cleanup of potential collisionsElijah Newren via GitGitGadget, Jun 30, 2022
  24. Ævar Arnfjörð BjarmasonJun 30, 2022
  25. Elijah NewrenJul 1, 2022
  26. 3/3 merge-ort: fix issue with dual rename and add/add conflictElijah Newren via GitGitGadget, Jun 30, 2022
  27. Ævar Arnfjörð BjarmasonJun 30, 2022
  28. Elijah NewrenJul 1, 2022
  29. 0/5 Fix dual rename into each other plus conflicting addsElijah Newren via GitGitGadget, Jul 1, 2022
  30. 1/5 t6423: add tests of dual directory rename plus add/add conflictElijah Newren via GitGitGadget, Jul 1, 2022
  31. 2/5 merge-ort: small cleanups of check_for_directory_renameElijah Newren via GitGitGadget, Jul 1, 2022
  32. 3/5 merge-ort: make a separate function for freeing struct collisionsElijah Newren via GitGitGadget, Jul 1, 2022
  33. 4/5 merge-ort: shuffle the computation and cleanup of potential collisionsElijah Newren via GitGitGadget, Jul 1, 2022
  34. Ævar Arnfjörð BjarmasonJul 1, 2022
  35. C99 "for (int ..." form on "master" (was: [PATCH v3 4/5] merge-ort: shuffle the computation and cleanup of potential collisions)Ævar Arnfjörð Bjarmason, Jul 25, 2022
  36. Elijah NewrenJul 26, 2022
  37. Junio C HamanoJul 26, 2022
  38. 5/5 merge-ort: fix issue with dual rename and add/add conflictElijah Newren via GitGitGadget, Jul 1, 2022
  39. 0/5 Fix dual rename into each other plus conflicting addsElijah Newren via GitGitGadget, Jul 5, 2022
  40. 1/5 t6423: add tests of dual directory rename plus add/add conflictElijah Newren via GitGitGadget, Jul 5, 2022
  41. 2/5 merge-ort: small cleanups of check_for_directory_renameElijah Newren via GitGitGadget, Jul 5, 2022
  42. 3/5 merge-ort: make a separate function for freeing struct collisionsElijah Newren via GitGitGadget, Jul 5, 2022
  43. 4/5 merge-ort: shuffle the computation and cleanup of potential collisionsElijah Newren via GitGitGadget, Jul 5, 2022
  44. 5/5 merge-ort: fix issue with dual rename and add/add conflictElijah Newren via GitGitGadget, Jul 5, 2022
  45. Junio C HamanoJul 6, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.