Skip to content
Snippets Groups Projects
  1. Feb 21, 2022
  2. Jan 29, 2022
    • Emanuele Aina's avatar
    • Emanuele Aina's avatar
      pkg-merge-updates: Try to fast-forward before rebasing · f36e681c
      Emanuele Aina authored
      
      Explicitly attempt a fast forward merge before rebasing.
      
      Currently we always try to rebase, which already doews a fast-forward
      merge when possible. The issue is that after that we incoditionally try
      to append a new changelog entry and if we're fast-forwarding we should
      **not** to that since the changelog will already have a version equal or
      newer than the one we're trying to add.
      
      By explicitly attempting a fast-forward merge and exiting early we avoid
      that issue.
      
      This has not been a particular issue so far since the mirroring
      pipeline which uses the rebasing feature does not usually trigger it
      when a fast-forward is possible and will create all the branches in
      their final state.
      
      However in some cases unrelated errors encountered during the process
      have left repositories in a inconsistent state and this change allows to
      recover cleanly from those situations.
      
      Signed-off-by: Emanuele Aina's avatarEmanuele Aina <emanuele.aina@collabora.com>
      f36e681c
  3. Jan 11, 2022
  4. Dec 15, 2021
  5. Oct 29, 2021
  6. Oct 28, 2021
  7. Oct 19, 2021
  8. Oct 07, 2021
  9. Oct 03, 2021
  10. May 31, 2021
  11. May 18, 2021
  12. Mar 03, 2021
  13. Feb 11, 2021
  14. Mar 30, 2020
  15. Jan 15, 2020
  16. Oct 10, 2019
  17. Aug 23, 2019
  18. Aug 02, 2019
  19. Jul 18, 2019
  20. Jul 17, 2019
  21. Apr 04, 2019
Loading