Jump to content

Krita/BigMergeProcedure: Difference between revisions

From KDE Community Wiki
Dmitry (talk | contribs)
Created page with "= Big merge checklist = If you are going to merge something big, and especially if this something big needs a new/updated dependencies, like Vc, libgsl or anything else, plea..."
 
Dmitry (talk | contribs)
No edit summary
 
(One intermediate revision by the same user not shown)
Line 3: Line 3:
If you are going to merge something big, and especially if this something big needs a new/updated dependencies, like Vc, libgsl or anything else, please follow this checklist to make sure your change doesn't introduce any unexpected problems the next day it gets merged :)
If you are going to merge something big, and especially if this something big needs a new/updated dependencies, like Vc, libgsl or anything else, please follow this checklist to make sure your change doesn't introduce any unexpected problems the next day it gets merged :)


# Create your own branch <code>yourname-feature[-phabricator_id_if_present]</code>
# Create your own branch ''yourname-feature[-phabricator_id_if_present]''
# [OPTIONAL] Add a patch review to the Differential review board
# [OPTIONAL] Add a patch review to the Differential review board
# If you your branch introduces/changes Krita dependency:
# If you your branch introduces/changes Krita dependency:
Line 12: Line 12:
#* Linux
#* Linux
#* OSX
#* OSX
#* if the dep is optional, check if it compiles with the dep switched off
# Ask Dmitry to check/update dependencies on Krita Lime
# Ask Dmitry to check/update dependencies on Krita Lime
# Now you are ready to merge!
# Now you are ready to merge!

Latest revision as of 10:14, 11 April 2016

Big merge checklist

If you are going to merge something big, and especially if this something big needs a new/updated dependencies, like Vc, libgsl or anything else, please follow this checklist to make sure your change doesn't introduce any unexpected problems the next day it gets merged :)

  1. Create your own branch yourname-feature[-phabricator_id_if_present]
  2. [OPTIONAL] Add a patch review to the Differential review board
  3. If you your branch introduces/changes Krita dependency:
    • send a mail to the mailing list asking people to build this dependency and test your branch
    • ask sysadmins to update this dep on KDE CI system
  4. Make sure you branch compiles on:
    • Windows
    • Linux
    • OSX
    • if the dep is optional, check if it compiles with the dep switched off
  5. Ask Dmitry to check/update dependencies on Krita Lime
  6. Now you are ready to merge!