Read about our upcoming Code of Conduct on this issue

This instance will be upgraded to Heptapod 0.28.1 on 2022-01-26 at 16:00 UTC+1 (a few minutes of down time)

  1. 29 May, 2021 2 commits
  2. 28 May, 2021 2 commits
  3. 26 May, 2021 1 commit
  4. 25 May, 2021 1 commit
  5. 24 May, 2021 4 commits
  6. 19 May, 2021 4 commits
  7. 08 May, 2021 2 commits
  8. 15 May, 2021 2 commits
    • Anton Shestakov's avatar
      next: refactor two if blocks into an if-elif block · 94aed9c7ce69
      Anton Shestakov authored
      We already checked the value of `needevolve and opts['evolve']` in the first if
      block above. In the first one it need to be True, in the second it needs to be
      False for the statements to execute. Since not(a or b) = not a and not b, we
      can join the second if block to the first one with an elif while dropping the
      explicit check.
      
      For me, this works better, because we're doing the same thing in both of these
      blocks (checking if working copy is dirty or not).
      
      --HG--
      branch : stable
      94aed9c7ce69
    • Anton Shestakov's avatar
      tests: demonstrate current behavior of hg next with --merge and --evolve · 126b9be3482d
      Anton Shestakov authored
      --HG--
      branch : stable
      126b9be3482d
  9. 02 May, 2021 1 commit
  10. 25 Apr, 2021 4 commits
  11. 12 Mar, 2021 1 commit
  12. 23 Apr, 2021 2 commits
  13. 22 Apr, 2021 3 commits
  14. 21 Apr, 2021 4 commits
  15. 22 Apr, 2021 1 commit
  16. 12 Mar, 2021 1 commit
  17. 03 Mar, 2021 1 commit
    • Sushil Khanchi's avatar
      divergence-resolution: use last evolution date to choose p1 when merging · aca07ac01167
      Sushil Khanchi authored
      Before this patch, we choose the minimum revision as p1 while merging the
      two divergent csets which had a drawback that if independent user resolve
      the same divergence, their final resolved cset would have different hashes
      (because of 'divergence_source_local' and 'divergence_source_other' extras).
      
      Now, we decide the p1 on the basis of which of the two divergent cset
      was rewritten more recently. This new logic removes the "different hash"
      problem.
      
      To save us from big output changes in the tests due to this change, I also
      added the second factor i.e revision_number while sorting the csets wrt dates
      (as date is same for all the csets in tests) to fallback to the old way of
      picking the revision i.e choosing the minimum rev number.
      
      And to demonstrate that now divergence resolution is independent of which
      side user run the `hg evolve --content-div` resolved cset id won't change,
      I have added a separate test file.
      Flag --config devel.default-date='...' is being used here to record a
      custom date in the obsmarkers.
      aca07ac01167
  18. 17 May, 2021 4 commits