Skip to content
Snippets Groups Projects
  1. Apr 23, 2020
  2. Feb 17, 2020
  3. Apr 18, 2020
  4. Apr 05, 2020
  5. Mar 30, 2020
  6. Mar 27, 2020
  7. Apr 05, 2020
    • Georges Racinet's avatar
      pull-force-topic: avoid divergence in overlapping pulls · 359d9bf9e090
      Georges Racinet authored
      As reported in heptapod#226, repeatedly importing the same
      changeset rewrites it several time, which is the very
      definition of content divergence.
      
      With these changes, we avoid re-pulling a changeset that's
      already present, yet obsolete. In the stacked PR use-case,
      the end result is that the second topic is orphan, but that's
      a much more frequent and easier to solve condition.
      
      We actually already had something for a similar case in the
      form of `non_obsolete_revs()`, but at the time the scenario of
      stacked PRs had been thought of only a posteriori, at the
      time of writing the docstring
      for the corresponding `test_already_obsolete()`. We could
      have thinked a bit more here.
      
      In truth `non_obsolete_revs()` is probably useless with our
      solution which is to take obsolete changesets into account in
      the initial assessment of the pull to be made, and that
      reflects with it not filtering anything in our existing tests.
      Since we are on the eve of a major release, we still keep it
      out of caution, only adding a direct test to restore coverage
      359d9bf9e090
  8. Mar 30, 2020
  9. Mar 29, 2020
  10. Mar 27, 2020
  11. Mar 16, 2020
  12. Mar 26, 2020
  13. Mar 25, 2020
  14. Mar 18, 2020
  15. Mar 17, 2020
  16. Mar 16, 2020
  17. Mar 15, 2020
  18. Mar 14, 2020
Loading