Skip to content
Snippets Groups Projects
  1. Nov 13, 2014
  2. Oct 28, 2014
    • Simona Vetter's avatar
      dim: Handle fast-forwards separately in update_nightly · 04df1b5a
      Simona Vetter authored
      We've had tons of fun in the past with -nightly merge commits, e.g.
      
      commit e47410aa
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Mon Sep 8 08:52:41 2014 +0200
      
          dim: cope better with silent conflict fixup patches
      
      Now another kind of fun showed up, namely when a merge is just a
      fast-forward without any content changes. That lead to the git diff
      --cached check failing, which lead to not committing the merge, which
      lead to to all subsequent merges failing too.
      
      Since this is all too fragile rework the logic a bit and first filter
      out the fast-forward merges. With those handled we know that there
      will be a real merge and so always something to commit. Which also
      means that we'll never have fun again with fixup patches getting lost.
      Hopefully.
      04df1b5a
  3. Oct 22, 2014
  4. Oct 21, 2014
  5. Oct 20, 2014
  6. Oct 16, 2014
  7. Oct 14, 2014
  8. Sep 24, 2014
    • Simona Vetter's avatar
      qf: Update TODO · 86d66201
      Simona Vetter authored
      - quilt patches can be listed with the git forwarding using qf branch
      - bash completion is done
      - qf pull is done
      86d66201
  9. Sep 23, 2014
    • Simona Vetter's avatar
      qf: Implement qf pull · b8ee865b
      Simona Vetter authored
      Similar to git fetch + git merge @{upstream}
      
      v2: Also support --rebase, like git pull --rebase. Also don't forget
      bash completion.
      b8ee865b
  10. Sep 22, 2014
  11. Sep 19, 2014
  12. Sep 18, 2014
  13. Sep 17, 2014
    • Simona Vetter's avatar
      dim: Improve updating of for-linux-next pointers · dd982d1a
      Simona Vetter authored
      The current approach has a bunch of problems:
      - It relies on the local maintainer's latest upstream version tags, so
        can flip-flop if they don't match.
      - It's not really precise around the merge window.
      
      The new approach should work a bit better:
      - Unconditionally push -fixes.
      - For the for-linux-next branch either push dinf or dinq. If dinf is ahead
        of -fixes then push dinf, assuming that drm-next is frozen already and
        that we've accumulated fixup patches already. If -fixes is ahead of dinf
        then push dinq assuming that the merge window has closed already.
      
      This means we need to refine our process a bit to make sure this works
      correctly:
      - Only push -fixes forward to the new release past -rc1. Use dinf for fixup
        patches while the merge window is still open.
      - As soon as -fixes has overtaken dinf don't roll it forward until drm-next
        is frozen for the next merge window.
      
      v2: Run this in -nightly instead of -rerere
      dd982d1a
    • Simona Vetter's avatar
      dim: workflow for drm-intel-next-fixes · 17d6a989
      Simona Vetter authored
      Mostly copypasta
      17d6a989
    • Simona Vetter's avatar
      dim: simplify update-branches · 3ed527ca
      Simona Vetter authored
      With rebase -i the default upstream is the remote branch, so no need
      to specify that explicitly.
      3ed527ca
  14. Sep 08, 2014
  15. Sep 04, 2014
  16. Aug 13, 2014
  17. Aug 04, 2014
  18. Jul 31, 2014
Loading